moved MGL initialization to earlier stage (crashes otherwise...) and implemented...

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index f124982646617ddf9c147e38283a06f5f10541c9..6289745486902ab5791fa02a8afe428783bd4c60 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -28,7 +28,9 @@ public:
              const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              long style = 0,

+#if wxUSE_VALIDATORS

              const wxValidator& validator = wxDefaultValidator,
              const wxValidator& validator = wxDefaultValidator,

+#endif

              const wxString& name = wxChoiceNameStr)
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
              const wxString& name = wxChoiceNameStr)
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);


@@ -39,7 +41,9 @@ public:
              const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxSize& size = wxDefaultSize,
              int n = 0, const wxString choices[] = NULL,
              long style = 0,

+#if wxUSE_VALIDATORS

              const wxValidator& validator = wxDefaultValidator,
              const wxValidator& validator = wxDefaultValidator,

+#endif

              const wxString& name = wxChoiceNameStr);
 
     // Implement base class virtuals
              const wxString& name = wxChoiceNameStr);
 
     // Implement base class virtuals


@@ -57,7 +61,7 @@ public:
 
     // OS2 only
     virtual bool OS2Command(WXUINT param, WXWORD id);
 
     // OS2 only
     virtual bool OS2Command(WXUINT param, WXWORD id);

-    MRESULT OS2WindowProc(HWND hwnd, WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

 
 protected:
     virtual void DoSetItemClientData( int n, void* clientData );
 
 protected:
     virtual void DoSetItemClientData( int n, void* clientData );


@@ -66,7 +70,7 @@ protected:
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // OS2 implementation
     virtual wxClientData* DoGetItemClientObject( int n ) const;
 
     // OS2 implementation

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);