Window management and sizer layout corrections

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index 8973977ea758312167ec4f61cab55635b0f780b9..55602617a4956dd728847b514b465716ffbaf929 100644 (file)
--- a/include/wx/os2/control.h
+++ b/include/wx/os2/control.h
@@ -14,8 +14,6 @@
 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
-

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


@@ -114,15 +112,14 @@ public:
 
     virtual wxSize DoGetBestSize(void) const;
 
 
     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 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
                          );
     //
     // Create the control of the given class with the given style, returns FALSE


@@ -137,10 +134,11 @@ public:
                          );
 
     //
                          );
 
     //

-    // Determine the extended styles combination for this window (may slightly
-    // modify styl parameter)
+    // Default style for the control include WS_TABSTOP if it AcceptsFocus()

     //
     //

-    WXDWORD GetExStyle(WXDWORD& rStyle) const;
+    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 int  GetXComp(void) const {return m_nXComp;}
     inline int  GetYComp(void) const {return m_nYComp;}