finished wxWindow for MGL

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

diff --git a/include/wx/os2/statbox.h b/include/wx/os2/statbox.h
index f5a9cb5b533a322a51b45ad079739c5ff531789d..df6122aeb91d3c8e5664abe4d4f0d0dde5fcab3d 100644 (file)
--- a/include/wx/os2/statbox.h
+++ b/include/wx/os2/statbox.h
@@ -17,7 +17,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 
 // Group box
 WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 
 // Group box

-class WXDLLEXPORT wxStaticBox: public wxControl
+class WXDLLEXPORT wxStaticBox : public wxStaticBoxBase

 {
   DECLARE_DYNAMIC_CLASS(wxStaticBox)
 
 {
   DECLARE_DYNAMIC_CLASS(wxStaticBox)
 


@@ -49,7 +49,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
 
     void OnEraseBackground(wxEraseEvent& event);
 
 
     void OnEraseBackground(wxEraseEvent& event);
 

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

 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);


@@ -58,7 +58,7 @@ class WXDLLEXPORT wxStaticBox: public wxControl
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:
     virtual bool AcceptsFocus() const { return FALSE; }
 
 protected:

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

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()