Fix bug with unloading wxPluginLibrary objects in "wrong" order.

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 12faf42fae1a527687d6708a2eae0057f8ee77d3..9825ad6b0cbf57892a1c9d7b0a1ac725d4726039 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -15,7 +15,7 @@
 #include "wx/dynarray.h"
 
 // General item class
 #include "wx/dynarray.h"
 
 // General item class

-class WXDLLEXPORT wxControl : public wxControlBase
+class WXDLLIMPEXP_CORE wxControl : public wxControlBase

 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 
 {
     DECLARE_ABSTRACT_CLASS(wxControl)
 


@@ -32,7 +32,6 @@ public:
     {
         Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );
     }
     {
         Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );
     }

-    virtual ~wxControl();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId


@@ -64,8 +63,8 @@ public:
     //
     // For ownerdraw items
     //
     //
     // For ownerdraw items
     //

-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; };
-    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
+    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }
+    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }

 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);


@@ -123,6 +122,7 @@ private:
     int m_nYComp;
 
     wxString m_label;
     int m_nYComp;
 
     wxString m_label;

+    WXDWORD  m_dwStyle;

 
     DECLARE_EVENT_TABLE()
 }; // end of wxControl
 
     DECLARE_EVENT_TABLE()
 }; // end of wxControl