X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37f214d588b02079a3ddf64c2e46585ca1657c1b..fb4888a650065c9a24572d6867345f34adafaa37:/include/wx/os2/control.h

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 28dd3626ec..396cf35fef 100644
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -12,6 +12,8 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
+#include "wx/dynarray.h"
+
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
@@ -19,72 +21,114 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
-   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; };
-
-   wxList& GetSubcontrols() { return m_subControls; }
-
-   void OnEraseBackground(wxEraseEvent& event);
-
-#if WXWIN_COMPATIBILITY
-   virtual void SetButtonColour(const wxColour& WXUNUSED(col)) { }
-   wxColour* GetButtonColour() const { return NULL; }
+   wxControl( wxWindow*          pParent
+             ,wxWindowID         vId
+             ,const wxPoint&     rPos = wxDefaultPosition
+             ,const wxSize&      rSize = wxDefaultSize
+             ,long               lStyle = 0
+             ,const wxValidator& rValidator = wxDefaultValidator
+             ,const wxString&    rsName = wxControlNameStr
+            )
+    {
+        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
+                ,const wxValidator& rValidator = wxDefaultValidator
+                ,const wxString&    rsName = wxControlNameStr
+               );
+
+    virtual void SetLabel(const wxString& rsLabel);
+
+    //
+    // 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 long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; };
+
+    wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
+    void             OnEraseBackground(wxEraseEvent& rEvent);
+    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
+                                ,WXHWND   pWnd
+                                ,WXUINT   nCtlColor
+                                ,WXUINT   uMessage
+                                ,WXWPARAM wParam
+                                ,WXLPARAM lParam
+                               );
 
-   inline virtual void SetLabelFont(const wxFont& font);
-   inline virtual void SetButtonFont(const wxFont& font);
-   inline wxFont& GetLabelFont() const;
-   inline wxFont& GetButtonFont() const;
-
-   // Adds callback
-   inline void Callback(const wxFunction function);
-
-   wxFunction GetCallback() { return m_callback; }
-
-protected:
-   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();
-
-   // create the control of the given class with the given style, returns FALSE
-   // if creation failed
-   bool OS2CreateControl(const wxChar *classname, WXDWORD style);
-
-   // 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;
+
+    //
+    // Create the control of the given PM class
+    //
+    bool OS2CreateControl( const wxChar*   zClassname
+                          ,const wxString& rsLabel
+                          ,const wxPoint&  rPos
+                          ,const wxSize&   rSize
+                          ,long            lStyle
+                         );
+    //
+    // 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
+                         );
+
+    //
+    // Default style for the control include WS_TABSTOP if it AcceptsFocus()
+    //
+    virtual WXDWORD OS2GetStyle( long     lStyle
+                                ,WXDWORD* pdwExstyle
+                               ) 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); }
-#endif // WXWIN_COMPATIBILITY
+#endif // _WX_CONTROL_H_
 
-#endif
-    // _WX_CONTROL_H_