AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fixes for wxUSE_COMBOBOX/RADIOBTN==0

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-07-11 00:03:09 +00:00
parent fae8664187
commit 00ce89e74a
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/window.cpp
View File

@ -424,6 +424,8 @@ void wxgtk_window_size_request_callback(GtkWidget *widget,
} }
} }
#if wxUSE_COMBOBOX
extern "C" { extern "C" {
static static
void wxgtk_combo_size_request_callback(GtkWidget *widget, void wxgtk_combo_size_request_callback(GtkWidget *widget,
@ -459,6 +461,8 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget,
} }
} }
#endif // wxUSE_COMBOBOX
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow // "expose_event" of m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2543,6 +2547,7 @@ void wxWindowGTK::PostCreation()
G_CALLBACK (gtk_window_size_callback), this); G_CALLBACK (gtk_window_size_callback), this);
} }
#if wxUSE_COMBOBOX
if (GTK_IS_COMBO(m_widget)) if (GTK_IS_COMBO(m_widget))
{ {
GtkCombo *gcombo = GTK_COMBO(m_widget); GtkCombo *gcombo = GTK_COMBO(m_widget);
@ -2551,8 +2556,10 @@ void wxWindowGTK::PostCreation()
G_CALLBACK (wxgtk_combo_size_request_callback), G_CALLBACK (wxgtk_combo_size_request_callback),
this); this);
} }
else
#endif // wxUSE_COMBOBOX
#ifdef GTK_IS_FILE_CHOOSER_BUTTON #ifdef GTK_IS_FILE_CHOOSER_BUTTON
else if (!gtk_check_version(2,6,0) && GTK_IS_FILE_CHOOSER_BUTTON(m_widget)) if (!gtk_check_version(2,6,0) && GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
{ {
// If we connect to the "size_request" signal of a GtkFileChooserButton // If we connect to the "size_request" signal of a GtkFileChooserButton
// then that control won't be sized properly when placed inside sizers // then that control won't be sized properly when placed inside sizers
@ -3179,11 +3186,13 @@ void wxWindowGTK::SetFocus()
{ {
if (GTK_IS_CONTAINER(m_widget)) if (GTK_IS_CONTAINER(m_widget))
{ {
#if wxUSE_RADIOBTN
if (IsKindOf(CLASSINFO(wxRadioButton))) if (IsKindOf(CLASSINFO(wxRadioButton)))
{ {
gtk_widget_grab_focus (m_widget); gtk_widget_grab_focus (m_widget);
return; return;
} }
#endif // wxUSE_RADIOBTN
gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD ); gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD );
} }