fixed problem with calling SetFont() when (multiline) text control didn't have any...

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index d3e7b4020e9e41b6ca12b09f1e2ee7a54dcd360e..af4e392ff1ae8257ce3638b5b77eed0b3c9cab6b 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -12,9 +12,9 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
-#ifdef __GNUG__
-    #pragma interface "control.h"
-#endif
+#include "wx/dynarray.h"
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
@@ -23,7 +23,27 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
-   virtual ~wxControl();
+   wxControl(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos = wxDefaultPosition,
+             const wxSize& size = wxDefaultSize,
+             long style = 0,
+#if wxUSE_VALIDATORS
+             const wxValidator& validator = wxDefaultValidator,
+#endif
+             const wxString& name = wxControlNameStr)
+    {
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
+            const wxValidator& validator = wxDefaultValidator,
+#endif
+            const wxString& name = wxControlNameStr);
+    virtual ~wxControl();
 
    // Simulates an event
    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
@@ -41,7 +61,7 @@ public:
    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
    virtual bool OS2OnMeasure(WXMEASUREITEMSTRUCT *WXUNUSED(item)) { return FALSE; };
 
-   wxList& GetSubcontrols() { return m_subControls; }
+   wxArrayLong& GetSubcontrols() { return m_subControls; }
 
    void OnEraseBackground(wxEraseEvent& event);
 
@@ -65,13 +85,17 @@ protected:
 
 protected:
    // For controls like radiobuttons which are really composite
-   wxList m_subControls;
+   wxArrayLong m_subControls;
 
-   virtual wxSize DoGetBestSize();
+   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);
+   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)