fix compilation in wxUSE_MENUS==0 case

[wxWidgets.git] / src / gtk / choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index ba57eaa3f57c21ff079aa4e3db007dc1080bfc01..ef4a9e61d197c48d62cf9547f9a52dd7adaa55d3 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -12,7 +12,6 @@
 #if wxUSE_CHOICE
 
 #include "wx/choice.h"
-#include "wx/combobox.h"
 
 #ifndef WX_PRECOMP
     #include "wx/arrstr.h"
@@ -41,9 +40,6 @@ extern bool   g_blockEventsOnDrag;
 extern "C" {
 static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
-    if (g_isIdle)
-      wxapp_install_idle_handler();
-
     if (!choice->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
@@ -98,11 +94,6 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
                        int n, const wxString choices[],
                        long style, const wxValidator& validator, const wxString &name )
 {
-    m_needParent = true;
-#if (GTK_MINOR_VERSION > 0)
-    m_acceptsFocus = true;
-#endif
-
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
@@ -134,7 +125,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    SetInitialSize(size); // need this too because this is a wxControlWithItems
 
     return true;
 }
@@ -600,7 +591,7 @@ wxSize wxChoice::DoGetBestSize() const
     return ret;
 }
 
-bool wxChoice::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxChoice::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 {
     return GTK_BUTTON(m_widget)->event_window;
 }