Merge in from trunk r67662 to r64801

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

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

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

 // Purpose:     wxCheckBox class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Purpose:     wxCheckBox class
 // Author:      David Webster
 // Modified by:
 // Created:     10/13/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKBOX_H_


@@ -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() { }


@@ -66,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: