Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

[wxWidgets.git] / include / wx / gtk1 / choice.h

diff --git a/include/wx/gtk1/choice.h b/include/wx/gtk1/choice.h
index 796d625f4b9c94f6ca477a1fb3de50731947445e..e405f01c72f3d55aee816a7ca6bc7ea0ff221575 100644 (file)
--- a/include/wx/gtk1/choice.h
+++ b/include/wx/gtk1/choice.h
@@ -16,8 +16,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_CHOICE
-

 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -32,7 +30,7 @@ class wxChoice;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxChoiceNameStr;
+extern const wxChar *wxChoiceNameStr;

 
 //-----------------------------------------------------------------------------
 // wxChoice
 
 //-----------------------------------------------------------------------------
 // wxChoice


@@ -95,10 +93,11 @@ public:
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
 
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
 

+    void DisableEvents();
+    void EnableEvents();

     void AppendCommon( const wxString &item );
     void ApplyWidgetStyle();
 };
 
     void AppendCommon( const wxString &item );
     void ApplyWidgetStyle();
 };
 

-#endif

 
 #endif // __GTKCHOICEH__
 
 #endif // __GTKCHOICEH__