1. wxMSW::wxNotebook::SetPageSize() and SetPadding() added

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 28dd3626ec27d4b1d91abfa30ed8084303976452..604e2f1a79e88157dd1aae6a98e08b82077081fc 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -12,6 +12,8 @@
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 
 #ifndef _WX_CONTROL_H_
 #define _WX_CONTROL_H_
 

+WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
+

 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {
 // General item class
 class WXDLLEXPORT wxControl : public wxControlBase
 {


@@ -19,7 +21,27 @@ class WXDLLEXPORT wxControl : public wxControlBase
 
 public:
    wxControl();
 
 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); }
 
    // Simulates an event
    virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }


@@ -63,11 +85,15 @@ protected:
    // For controls like radiobuttons which are really composite
    wxList m_subControls;
 
    // For controls like radiobuttons which are really composite
    wxList 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
 
    // 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)
 
    // determine the extended styles combination for this window (may slightly
    // modify styl parameter)