Bug #1040683: Remove assert when deleting menu entry.

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

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index c3fc2e25138f35e2141ac96247a9128b73d13cd7..c2ea188daba2c93839297077143af91de4cfe2a4 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -14,80 +14,104 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
-
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCheckBox: public wxControl
+class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
  public:
-  inline wxCheckBox() { }
-  inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxCheckBoxNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+    inline wxCheckBox() { }
+    inline wxCheckBox( wxWindow*          pParent
+                      ,wxWindowID         vId
+                      ,const wxString&    rsLabel
+                      ,const wxPoint&     rPos = wxDefaultPosition
+                      ,const wxSize&      rSize = wxDefaultSize
+                      ,long lStyle = 0
+                      ,const wxValidator& rValidator = wxDefaultValidator
+                      ,const wxString&    rsName = wxCheckBoxNameStr
+                     )
+    {
+        Create( pParent
+               ,vId
+               ,rsLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxCheckBoxNameStr);
+    bool Create( wxWindow* pParent
+                ,wxWindowID         vId
+                ,const wxString&    rsLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxCheckBoxNameStr
+               );
 
-  virtual void SetValue(bool);
-  virtual bool GetValue() const ;
+  virtual void SetValue(bool bValue);
+  virtual bool GetValue(void) const ;
 
-  virtual bool OS2Command(WXUINT param, WXWORD id);
-  virtual void SetLabel(const wxString& label);
-  virtual void Command(wxCommandEvent& event);
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool OS2Command( WXUINT uParam
+                          ,WXWORD wId
+                         );
+  virtual void SetLabel(const wxString& rsLabel);
+  virtual void Command(wxCommandEvent& rEvent);
 
 protected:
-  virtual wxSize DoGetBestSize();
+  virtual wxSize DoGetBestSize(void) const;
+private:
+  DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
-  DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
-
  public:
-  int checkWidth ;
-  int checkHeight ;
 
-  inline wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; }
-  inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxCheckBoxNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+    inline wxBitmapCheckBox() { m_nCheckWidth = -1; m_nCheckHeight = -1; }
+    inline wxBitmapCheckBox( wxWindow*          pParent
+                            ,wxWindowID         vId
+                            ,const wxBitmap*    pLabel
+                            ,const wxPoint&     rPos = wxDefaultPosition
+                            ,const wxSize&      rSize = wxDefaultSize
+                            ,long               lStyle = 0
+                            ,const wxValidator& rValidator = wxDefaultValidator
+                            ,const wxString&    rsName = wxCheckBoxNameStr
+                           )
+    {
+        Create( pParent
+               ,vId
+               ,pLabel
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
+    }
 
-  bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-#if wxUSE_VALIDATORS
-           const wxValidator& validator = wxDefaultValidator,
-#endif
-           const wxString& name = wxCheckBoxNameStr);
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxBitmap*    pLabel
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxCheckBoxNameStr
+               );
+
+    virtual void SetLabel(const wxBitmap& rBitmap);
+
+    int                             m_nCheckWidth;
+    int                             m_nCheckHeight;
 
-  virtual void SetLabel(const wxBitmap& bitmap);
 private:
-  virtual void SetLabel(const wxString& string)
-  { wxCheckBox::SetLabel(string); };
+
+    virtual void SetLabel(const wxString& rsString)
+    { wxCheckBox::SetLabel(rsString); };
+    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
 };
 #endif
     // _WX_CHECKBOX_H_