fix VC compilation warnings about implicit int->bool conversion after last check in

[wxWidgets.git] / include / wx / os2 / bmpbuttn.h

diff --git a/include/wx/os2/bmpbuttn.h b/include/wx/os2/bmpbuttn.h
index 48c13f2b31660f556d094f234b19d1dabc486135..905d372a225d8aeb7267295491f6ade6a9214b3a 100644 (file)
--- a/include/wx/os2/bmpbuttn.h
+++ b/include/wx/os2/bmpbuttn.h
@@ -13,8 +13,9 @@
 #define _WX_BMPBUTTN_H_
 
 #include "wx/button.h"
 #define _WX_BMPBUTTN_H_
 
 #include "wx/button.h"

+#include "wx/dcclient.h"

 
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 


@@ -32,9 +33,7 @@ public:
                           ,const wxPoint&     rPos = wxDefaultPosition
                           ,const wxSize&      rSize = wxDefaultSize
                           ,long               lStyle = wxBU_AUTODRAW
                           ,const wxPoint&     rPos = wxDefaultPosition
                           ,const wxSize&      rSize = wxDefaultSize
                           ,long               lStyle = wxBU_AUTODRAW

-#if wxUSE_VALIDATORS

                           ,const wxValidator& rValidator = wxDefaultValidator
                           ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                           ,const wxString&    rsName = wxButtonNameStr
                          )
     {
                           ,const wxString&    rsName = wxButtonNameStr
                          )
     {


@@ -44,9 +43,7 @@ public:
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -57,9 +54,7 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxBU_AUTODRAW
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = wxBU_AUTODRAW

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxButtonNameStr
                );
 
                 ,const wxString&    rsName = wxButtonNameStr
                );
 


@@ -68,13 +63,6 @@ public:
         SetBitmapLabel(rBitmap);
     }
 
         SetBitmapLabel(rBitmap);
     }
 

-#if WXWIN_COMPATIBILITY
-    wxBitmap* GetBitmap(void) const
-    {
-        return (wxBitmap *)&m_buttonBitmap;
-    }
-#endif
-

     //
     // Implementation
     //
     //
     // Implementation
     //