wxUSE_CONSTRAINTS now refers to constraints only, since sizers

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

diff --git a/include/wx/os2/control.h b/include/wx/os2/control.h
index d7cfb69f0fa49fedf775fdceeab1d3cb439d0e09..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
 {


@@ -106,7 +104,7 @@ protected:
     wxFunction                      m_callback;     // Callback associated with the window
 #endif // WXWIN_COMPATIBILITY
 
     wxFunction                      m_callback;     // Callback associated with the window
 #endif // WXWIN_COMPATIBILITY
 

-protected:
+public:

     //
     // For controls like radiobuttons which are really composite
     //
     //
     // For controls like radiobuttons which are really composite
     //


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


@@ -127,12 +134,20 @@ protected:
                          );
 
     //
                          );
 
     //

-    // 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 void SetXComp(const int nXComp) {m_nXComp = nXComp;}
+    inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}

 
 private:
 
 private:

+    int                             m_nXComp;
+    int                             m_nYComp;

    DECLARE_EVENT_TABLE()
 }; // end of wxControl
 
    DECLARE_EVENT_TABLE()
 }; // end of wxControl