compilation fix for cygwin

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

diff --git a/include/wx/motif/checkbox.h b/include/wx/motif/checkbox.h
index e6ca1a43aebb316fb02750449bf1b6bfb4d5ae2d..b38d4415388dcefe4b89426635903d32646dc203 100644 (file)
--- a/include/wx/motif/checkbox.h
+++ b/include/wx/motif/checkbox.h
@@ -22,70 +22,70 @@ WXDLLEXPORT_DATA(extern const char*) wxCheckBoxNameStr;
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxBitmap;
 
 // 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,
-           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() const ;
-  virtual void Command(wxCommandEvent& event);
-
-// Implementation
-  virtual void ChangeFont(bool keepOriginalSize = TRUE);
-  virtual void ChangeBackgroundColour();
-  virtual void ChangeForegroundColour();
+    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,
+        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() const ;
+    virtual void Command(wxCommandEvent& event);
+    
+    // Implementation
+    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeBackgroundColour();
+    virtual void ChangeForegroundColour();

 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
 };
 
 class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)

-
+        

 public:
     int checkWidth;
     int checkHeight;
 public:
     int checkWidth;
     int checkHeight;

-
+    

     inline wxBitmapCheckBox() { checkWidth = -1; checkHeight = -1; }
     inline wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
     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,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
+        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);
     }
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }

-
+    

     bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
     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);
-
+        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 void SetValue(bool value);
     virtual bool GetValue() const;

-
+    

     virtual void SetLabel(const wxBitmap& bitmap);
     virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };
     virtual void SetLabel(const wxBitmap& bitmap);
     virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); };

-
+    

 protected:
     virtual void DoSetSize(int x, int y,
 protected:
     virtual void DoSetSize(int x, int y,

-            int width, int height,
-            int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);

 };
 #endif
 };
 #endif

-    // _WX_CHECKBOX_H_
+// _WX_CHECKBOX_H_