Applied patch sent to me for xpmdecod.cpp/VC++ compilation, and changed

[wxWidgets.git] / src / os2 / checkbox.cpp

diff --git a/src/os2/checkbox.cpp b/src/os2/checkbox.cpp
index 035c4504cc34c7e5e012ccaf670e0eade745ad98..b98fff55896ec6b15cb43d84d9aa5594e33601d6 100644 (file)
--- a/src/os2/checkbox.cpp
+++ b/src/os2/checkbox.cpp
@@ -23,10 +23,8 @@
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -50,11 +48,7 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator,
-#  else

            const wxValidator& validator,
            const wxValidator& validator,

-#  endif

 #endif
            const wxString& name)
 {
 #endif
            const wxString& name)
 {


@@ -100,7 +94,7 @@ void wxCheckBox::SetLabel(const wxString& label)
     // TODO
 }
 
     // TODO
 }
 

-wxSize wxCheckBox::DoGetBestSize()
+wxSize wxCheckBox::DoGetBestSize() const

 {
     int wCheckbox, hCheckbox;
 
 {
     int wCheckbox, hCheckbox;
 


@@ -185,11 +179,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS
            const wxPoint& pos,
            const wxSize& size, long style,
 #if wxUSE_VALIDATORS

-#  if defined(__VISAGECPP__)
-           const wxValidator* validator,
-#  else

            const wxValidator& validator,
            const wxValidator& validator,

-#  endif

 #endif
            const wxString& name)
 {
 #endif
            const wxString& name)
 {


@@ -215,7 +205,7 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
 
     checkWidth = -1 ;
     checkHeight = -1 ;
 
     checkWidth = -1 ;
     checkHeight = -1 ;

-    long msStyle = CHECK_FLAGS;
+//    long msStyle = CHECK_FLAGS;

 
     HWND wx_button = 0; // TODO: Create the bitmap checkbox
 
 
     HWND wx_button = 0; // TODO: Create the bitmap checkbox