wxMac should use /src/mac/carbon/spinctrl.cpp, applied some sizing

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 7bcd8ef308b9338dbd5dc75cfa970342297a9934..64dedbf487c036c514f4cc029b0e6a699edf187e 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -1,86 +1,65 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.h
+// Name:        wx/msw/checkbox.h

 // Purpose:     wxCheckBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCheckBox class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
 #define _WX_CHECKBOX_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "checkbox.h"
 #endif
 
 #pragma interface "checkbox.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
-

 // Checkbox item (single checkbox)
 // Checkbox item (single checkbox)

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCheckBox : public wxControl
+class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-

 public:
     wxCheckBox() { }
 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)
+    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);
     }
 
     {
         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);
+    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 void SetValue(bool value);

-    virtual bool GetValue() const ;
+    virtual bool GetValue() const;

 
 

-    virtual bool MSWCommand(WXUINT param, WXWORD id);

     virtual void SetLabel(const wxString& label);
     virtual void SetLabel(const wxString& label);

+
+    virtual bool MSWCommand(WXUINT param, WXWORD id);

     virtual void Command(wxCommandEvent& event);
     virtual void Command(wxCommandEvent& event);

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

 
 protected:
 
 protected:

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

 
 

-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
-{
-DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
+    virtual void DoSet3StateValue(wxCheckBoxState value);

 
 

-public:
-    int checkWidth ;
-    int checkHeight ;
+    virtual wxCheckBoxState DoGet3StateValue() const;

 
 

-    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);
-    }
-
-    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 SetLabel(const wxBitmap& bitmap);
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckBox)

 };
 };

+

 #endif
     // _WX_CHECKBOX_H_
 #endif
     // _WX_CHECKBOX_H_