common private decls

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 8da501c1d22b4cdffb9c23fb727a946805c3b934..dd7076542e7faf0527696c67026a26ef8424e69c 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

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


@@ -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)
 


@@ -30,14 +30,7 @@ public:
              ,const wxString&    rsName = wxControlNameStr
             )
     {
              ,const wxString&    rsName = wxControlNameStr
             )
     {

-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
+        Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );

     }
     virtual ~wxControl();
 
     }
     virtual ~wxControl();
 


@@ -50,6 +43,9 @@ public:
                 ,const wxString&    rsName = wxControlNameStr
                );
 
                 ,const wxString&    rsName = wxControlNameStr
                );
 

+    virtual void SetLabel(const wxString& rsLabel);
+    virtual wxString GetLabel() const { return m_label; }
+

     //
     // Simulates an event
     //
     //
     // Simulates an event
     //


@@ -68,7 +64,7 @@ public:
     //
     // For ownerdraw items
     //
     //
     // For ownerdraw items
     //

-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
+    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; };

     virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }


@@ -81,16 +77,6 @@ public:
                                 ,WXLPARAM lParam
                                );
 
                                 ,WXLPARAM lParam
                                );
 

-#if WXWIN_COMPATIBILITY
-    virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { }
-    wxColour*    GetButtonColour(void) const { return NULL; }
-
-    inline virtual void SetLabelFont(const wxFont& rFont);
-    inline virtual void SetButtonFont(const wxFont& rFont);
-    inline wxFont&      GetLabelFont(void) const;
-    inline wxFont&      GetButtonFont(void) const;
-#endif // WXWIN_COMPATIBILITY
-

 public:
     //
     // For controls like radiobuttons which are really composite
 public:
     //
     // For controls like radiobuttons which are really composite


@@ -109,7 +95,7 @@ public:
                           ,long            lStyle
                          );
     //
                           ,long            lStyle
                          );
     //

-    // Create the control of the given class with the given style, returns FALSE
+    // Create the control of the given class with the given style, returns false

     // if creation failed.
     //
     bool OS2CreateControl( const wxChar*   zClassname
     // if creation failed.
     //
     bool OS2CreateControl( const wxChar*   zClassname


@@ -133,17 +119,13 @@ public:
     inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
 
 private:
     inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
 
 private:

-    int                             m_nXComp;
-    int                             m_nYComp;
-   DECLARE_EVENT_TABLE()
-}; // end of wxControl
+    int m_nXComp;
+    int m_nYComp;

 
 

-#if WXWIN_COMPATIBILITY
-    inline wxFont& wxControl::GetLabelFont(void) const { return GetFont(); }
-    inline wxFont& wxControl::GetButtonFont(void) const { return GetFont(); }
-    inline void wxControl::SetLabelFont(const wxFont& rFont) { SetFont(rFont); }
-    inline void wxControl::SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
-#endif // WXWIN_COMPATIBILITY
+    wxString m_label;
+    WXDWORD  m_dwStyle;

 
 

-#endif // _WX_CONTROL_H_
+    DECLARE_EVENT_TABLE()
+}; // end of wxControl

 
 

+#endif // _WX_CONTROL_H_