Use wxAlphaPixelData if the source bitmap depth is 32 or if on wxGTK and there is...

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

diff --git a/include/wx/os2/checkbox.h b/include/wx/os2/checkbox.h
index 12a43f701db42b5c8d1fb6d7720240099b23835c..b7d4c9bcfda9f6177994150ed295ebe23928c3ee 100644 (file)
--- a/include/wx/os2/checkbox.h
+++ b/include/wx/os2/checkbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCheckBox class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxCheckBox class
 // Author:      David Webster
 // Modified by:


@@ -15,8 +15,8 @@
 #include "wx/control.h"
 
 // Checkbox item (single checkbox)
 #include "wx/control.h"
 
 // Checkbox item (single checkbox)

-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase

 {
  public:
     inline wxCheckBox() { }
 {
  public:
     inline wxCheckBox() { }


@@ -26,9 +26,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                       ,const wxPoint&     rPos = wxDefaultPosition
                       ,const wxSize&      rSize = wxDefaultSize
                       ,long lStyle = 0
                       ,const wxPoint&     rPos = wxDefaultPosition
                       ,const wxSize&      rSize = wxDefaultSize
                       ,long lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -38,9 +36,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -51,9 +47,7 @@ class WXDLLEXPORT wxCheckBox : public wxCheckBoxBase
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -72,7 +66,7 @@ private:
   DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 
   DECLARE_DYNAMIC_CLASS(wxCheckBox)
 };
 

-class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
+class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox

 {
  public:
 
 {
  public:
 


@@ -83,9 +77,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                             ,const wxPoint&     rPos = wxDefaultPosition
                             ,const wxSize&      rSize = wxDefaultSize
                             ,long               lStyle = 0
                             ,const wxPoint&     rPos = wxDefaultPosition
                             ,const wxSize&      rSize = wxDefaultSize
                             ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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


@@ -106,9 +98,7 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

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

-#endif

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