correction for compilation with -cpp-precomp option

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index e5ddc460f6704b1128cdc716a216ba107f2c6834..2dc291ebb97d71fae7bf990db9d1ce8bbe75f78c 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -18,67 +18,67 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;

 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;

-class WXDLLEXPORT wxCheckBox: public wxControl
+class WXDLLEXPORT wxCheckBox : public wxControl

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
+DECLARE_DYNAMIC_CLASS(wxCheckBox)

 
 

- public:
-  inline wxCheckBox(void) { }
-  inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxCheckBoxNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+public:
+    wxCheckBox() { }
+    wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }

 
 

-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxCheckBoxNameStr);
-  virtual void SetValue(bool);
-  virtual bool GetValue(void) const ;
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual bool MSWCommand(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);
+    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr);
+
+    virtual void SetValue(bool value);
+    virtual bool GetValue() const ;
+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+    virtual void SetLabel(const wxString& label);
+    virtual void Command(wxCommandEvent& event);
+
+protected:
+    virtual wxSize DoGetBestSize() const;

 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+
+public:
+    int checkWidth ;
+    int checkHeight ;

 
 

- public:
-  int checkWidth ;
-  int checkHeight ;
+    wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; }
+    wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr)
+    {
+        Create(parent, id, label, pos, size, style, validator, name);
+    }

 
 

-  inline wxBitmapCheckBox(void) { checkWidth = -1; checkHeight = -1; }
-  inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxCheckBoxNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
+    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxCheckBoxNameStr);

 
 

-  bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxCheckBoxNameStr);
-  virtual void SetValue(bool);
-  virtual bool GetValue(void) const ;
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-  virtual void SetLabel(const wxBitmap *bitmap);
+    virtual void SetLabel(const wxBitmap& bitmap);

 };
 #endif
     // _WX_CHECKBOX_H_
 };
 #endif
     // _WX_CHECKBOX_H_