added a few WXDLLEXPORTS, corrected/expanded comments

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 7bcd8ef308b9338dbd5dc75cfa970342297a9934..97cf1d32b51d165c2e7702f3b07de06af92d23cf 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_


@@ -16,16 +16,10 @@
 #pragma interface "checkbox.h"
 #endif
 
 #pragma interface "checkbox.h"
 #endif
 

-#include "wx/control.h"
-
-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 wxCheckBoxBase

 {
 {

-DECLARE_DYNAMIC_CLASS(wxCheckBox)
-

 public:
     wxCheckBox() { }
     wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
 public:
     wxCheckBox() { }
     wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,


@@ -49,11 +43,12 @@ public:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void SetLabel(const wxString& label);
     virtual void Command(wxCommandEvent& event);
     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);

 
 protected:
 
 protected:

-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxCheckBox)

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


@@ -82,5 +77,6 @@ public:
 
     virtual void SetLabel(const wxBitmap& bitmap);
 };
 
     virtual void SetLabel(const wxBitmap& bitmap);
 };

+

 #endif
     // _WX_CHECKBOX_H_
 #endif
     // _WX_CHECKBOX_H_