corrected a bug in dc which resetted the port , exchanged the wxchoice implementation

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

diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h
index 90e562511952d5ec14892d4fa1eac16a7084bf48..2dc291ebb97d71fae7bf990db9d1ce8bbe75f78c 100644 (file)
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -49,13 +49,9 @@ 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 void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize() const;

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


@@ -82,15 +78,7 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxCheckBoxNameStr);
 
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxCheckBoxNameStr);
 

-    virtual void SetValue(bool value);
-    virtual bool GetValue() const ;
-

     virtual void SetLabel(const wxBitmap& bitmap);
     virtual void SetLabel(const wxBitmap& bitmap);

-
-protected:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);

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