X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9380570921e22b1037b9415f64b299669a23e88..7eff657c071f9df1938edb2d1b530492ccfc9489:/include/wx/os2/control.h

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 467db17931..661efc7b06 100644
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+#include "wx/dynarray.h"
 
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
@@ -21,96 +21,143 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
-   wxControl(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
+   wxControl( wxWindow*          pParent
+             ,wxWindowID         vId
+             ,const wxPoint&     rPos = wxDefaultPosition
+             ,const wxSize&      rSize = wxDefaultSize
+             ,long               lStyle = 0
 #if wxUSE_VALIDATORS
-             const wxValidator& validator = wxDefaultValidator,
+             ,const wxValidator& rValidator = wxDefaultValidator
 #endif
-             const wxString& name = wxControlNameStr)
+             ,const wxString&    rsName = wxControlNameStr
+            )
     {
-        Create(parent, id, pos, size, style, validator, name);
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,lStyle
+               ,rValidator
+               ,rsName
+              );
     }
+    virtual ~wxControl();
 
-    bool Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
+    bool Create( wxWindow*          pParent
+                ,wxWindowID         vId
+                ,const wxPoint&     rPos = wxDefaultPosition
+                ,const wxSize&      rSize = wxDefaultSize
+                ,long               lStyle = 0
 #if wxUSE_VALIDATORS
-            const wxValidator& validator = wxDefaultValidator,
+                ,const wxValidator& rValidator = wxDefaultValidator
 #endif
-            const wxString& name = wxControlNameStr);
-    virtual ~wxControl();
-
-   // Simulates an event
-   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-   // implementation from now on
-   // --------------------------
-
-   // Calls the callback and appropriate event handlers
-   bool ProcessCommand(wxCommandEvent& event);
-
-   // OS2-specific
-   virtual bool OS2OnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-   // For ownerdraw items
-   virtual bool OS2OnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-   virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
-
-   wxArrayLong& GetSubcontrols() { return m_subControls; }
-
-   void OnEraseBackground(wxEraseEvent& event);
+                ,const wxString&    rsName = wxControlNameStr
+               );
+
+    //
+    // Simulates an event
+    //
+    virtual void Command(wxCommandEvent& rEvent) { ProcessCommand(rEvent); }
+
+    //
+    // Implementation from now on
+    // --------------------------
+    //
+
+    //
+    // Calls the callback and appropriate event handlers
+    //
+    bool ProcessCommand(wxCommandEvent& rEvent);
+
+    //
+    // For ownerdraw items
+    //
+    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
+    virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return FALSE; };
+
+    wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
+    void             OnEraseBackground(wxEraseEvent& rEvent);
+    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
+                                ,WXHWND   pWnd
+                                ,WXUINT   nCtlColor
+                                ,WXUINT   uMessage
+                                ,WXWPARAM wParam
+                                ,WXLPARAM lParam
+                               );
 
 #if WXWIN_COMPATIBILITY
-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() const { return NULL; }
-
-   inline virtual void SetLabelFont(const wxFont& font);
-   inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont& GetLabelFont() const;
-   inline wxFont& GetButtonFont() const;
+    virtual void SetButtonColour(const wxColour& WXUNUSED(rCol)) { }
+    wxColour*    GetButtonColour(void) const { return NULL; }
 
-   // Adds callback
-   inline void Callback(const wxFunction function);
+    inline virtual void SetLabelFont(const wxFont& rFont);
+    inline virtual void SetButtonFont(const wxFont& rFont);
+    inline wxFont&      GetLabelFont(void) const;
+    inline wxFont&      GetButtonFont(void) const;
 
-   wxFunction GetCallback() { return m_callback; }
+    //
+    // Adds callback
+    //
+    inline void Callback(const wxFunction function);
+    wxFunction  GetCallback(void) { return m_callback; }
 
 protected:
-   wxFunction       m_callback;     // Callback associated with the window
+    wxFunction                      m_callback;     // Callback associated with the window
 #endif // WXWIN_COMPATIBILITY
 
-protected:
-   // For controls like radiobuttons which are really composite
-   wxList m_subControls;
-
-   virtual wxSize DoGetBestSize() const;
-
-   // create the control of the given class with the given style, returns FALSE
-   // if creation failed
-   bool OS2CreateControl(const wxChar *classname, WXDWORD style,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& size = wxDefaultSize,
-                         const wxString& label = wxEmptyString,
-                         WXDWORD exstyle = (WXDWORD)-1);
-
-   // determine the extended styles combination for this window (may slightly
-   // modify styl parameter)
-   WXDWORD GetExStyle(WXDWORD& style) const;
+public:
+    //
+    // For controls like radiobuttons which are really composite
+    //
+    wxArrayLong m_aSubControls;
+
+    virtual wxSize DoGetBestSize(void) const;
+
+    bool OS2CreateControl( wxWindow*          pParent
+                          ,wxWindowID         lId
+                          ,const wxPoint&     rPos
+                          ,const wxSize&      rSize
+                          ,long               lStyle
+#if wxUSE_VALIDATORS
+                          ,const wxValidator& rValidator
+#endif
+                          ,const wxString&    rsName
+                         );
+    //
+    // Create the control of the given class with the given style, returns FALSE
+    // if creation failed.
+    //
+    bool OS2CreateControl( const wxChar*   zClassname
+                          ,WXDWORD         dwStyle
+                          ,const wxPoint&  rPos = wxDefaultPosition
+                          ,const wxSize&   rSize = wxDefaultSize
+                          ,const wxString& rsLabel = wxEmptyString
+                          ,WXDWORD         dwExstyle = (WXDWORD)-1
+                         );
+
+    //
+    // Determine the extended styles combination for this window (may slightly
+    // modify styl parameter)
+    //
+    WXDWORD GetExStyle(WXDWORD& rStyle) const;
+
+    inline int  GetXComp(void) const {return m_nXComp;}
+    inline int  GetYComp(void) const {return m_nYComp;}
+    inline void SetXComp(const int nXComp) {m_nXComp = nXComp;}
+    inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
 
 private:
+    int                             m_nXComp;
+    int                             m_nYComp;
    DECLARE_EVENT_TABLE()
-};
-
+}; // end of wxControl
 
 #if WXWIN_COMPATIBILITY
     inline void wxControl::Callback(const wxFunction f) { m_callback = f; };
-    inline wxFont& wxControl::GetLabelFont() const { return GetFont(); }
-    inline wxFont& wxControl::GetButtonFont() const { return GetFont(); }
-    inline void wxControl::SetLabelFont(const wxFont& font) { SetFont(font); }
-    inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
+    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
 
-#endif
-    // _WX_CONTROL_H_
+#endif // _WX_CONTROL_H_
+