Don't define __STRICT_ANSI__, we should build both with and without it.

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 55602617a4956dd728847b514b465716ffbaf929..0d799ed1ccec36d58ce83d4233246215faacca14 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxControl class
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99
 // Purpose:     wxControl class
 // Author:      David Webster
 // Modified by:
 // Created:     09/17/99

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -15,7 +14,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)
 


@@ -26,34 +25,25 @@ public:
              ,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 = wxControlNameStr
             )
     {
              ,const wxString&    rsName = wxControlNameStr
             )
     {

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

     }
     }

-    virtual ~wxControl();

 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                 ,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 = wxControlNameStr
                );
 
                 ,const wxString&    rsName = wxControlNameStr
                );
 

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

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


@@ -72,8 +62,8 @@ public:
     //
     // For ownerdraw items
     //
     //
     // For ownerdraw items
     //

-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
-    virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* 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; }
     void             OnEraseBackground(wxEraseEvent& rEvent);
 
     wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
     void             OnEraseBackground(wxEraseEvent& rEvent);


@@ -85,25 +75,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;
-
-    //
-    // Adds callback
-    //
-    inline void Callback(const wxFunction function);
-    wxFunction  GetCallback(void) { return m_callback; }
-
-protected:
-    wxFunction                      m_callback;     // Callback associated with the window
-#endif // WXWIN_COMPATIBILITY
-

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


@@ -122,7 +93,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


@@ -146,18 +117,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 void wxControl::Callback(const wxFunction f) { m_callback = f; };
-    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_