C/POSIX locales (or absence of locale information) corresponds to wxLANGUAGE_ENGLISH_...

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

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index ba57eaa3f57c21ff079aa4e3db007dc1080bfc01..02b6c41b2a617de22f10821042790c5e44819638 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"
@@ -134,7 +133,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 +599,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;
 }