Style updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/os2/button.h

@@ -80,8 +80,11 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
 protected:
 
-    bool           SendClickEvent(void);
-    virtual wxSize DoGetBestSize(void) const;
+    bool            SendClickEvent(void);
+    virtual wxSize  DoGetBestSize(void) const;
+    virtual WXDWORD OS2GetStyle( long     style
+                                ,WXDWORD* exstyle
+                               ) const;
 private:
   DECLARE_DYNAMIC_CLASS(wxButton)
 }; // end of CLASS wxButton

include/wx/os2/control.h

@@ -112,15 +112,14 @@ public:
 
     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
@@ -135,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;}

include/wx/os2/cursor.h

@@ -39,6 +39,7 @@ public:
 
   // Copy constructors
   inline wxCursor(const wxCursor& cursor) { Ref(cursor); }
+         wxCursor(const wxImage& rImage);
 
   wxCursor(const char bits[], int width, int height, int hotSpotX = -1, int hotSpotY = -1,
     const char maskBits[] = NULL);

include/wx/os2/statline.h

@@ -74,6 +74,13 @@ protected:
 
     inline wxSize DoGetBestSize(void) const { return (AdjustSize(wxDefaultSize)); }
 
+    //
+    // Usually overridden base class virtuals
+    //
+    virtual WXDWORD OS2GetStyle( long     lStyle
+                                ,WXDWORD* pdwExstyle
+                               ) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxStaticLine)
 }; // end of CLASS wxStaticLine

include/wx/os2/textctrl.h

@@ -117,6 +117,7 @@ public:
                               ,long lTo
                              );
     virtual void SetEditable(bool bEditable);
+    virtual void SetWindowStyleFlag(long lStyle);
 
     //
     // Implementation from now on
@@ -171,6 +172,9 @@ protected:
     virtual wxSize DoGetBestSize(void) const;
     virtual bool   OS2ShouldPreProcessMessage(WXMSG* pMsg);
 
+    virtual WXDWORD OS2GetStyle( long     lStyle
+                                ,WXDWORD* dwExstyle
+                               ) const;
 private:
     bool                            m_bIsMLE;
     DECLARE_EVENT_TABLE()

include/wx/os2/toplevel.h

@@ -124,13 +124,11 @@ protected:
                                 ) const;
 
     //
-    // Get the OS/2 window flags corresponding to wxWindows ones
+    // Translate wxWindows flags into OS flags
     //
-    // The functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
-    //
-    long OS2GetCreateWindowFlags(long* lExflags) const;
-
+    virtual WXDWORD OS2GetStyle( long     lFlag
+                                ,WXDWORD* pdwExstyle
+                               ) const;
     //
     // Is the frame currently iconized?
     //

include/wx/os2/window.h

@@ -106,6 +106,7 @@ public:
     virtual void     Freeze(void);
     virtual void     Update(void);
     virtual void     Thaw(void);
+    virtual void     SetWindowStyleFlag(long lStyle);
     virtual bool     SetCursor(const wxCursor& rCursor);
     virtual bool     SetFont(const wxFont& rFont);
     virtual int      GetCharHeight(void) const;
@@ -253,6 +254,23 @@ public:
     // PM only: TRUE if this control is part of the main control
     virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return FALSE; };
 
+    // translate wxWindows style flags for this control into the PM style
+    // and optional extended style for the corresponding native control
+    //
+    // this is the function that should be overridden in the derived classes,
+    // but you will mostly use OS2GetCreateWindowFlags() below
+    virtual WXDWORD OS2GetStyle( long     lFlags
+                                ,WXDWORD* pdwExstyle = NULL
+                               ) const;
+
+    // get the MSW window flags corresponding to wxWindows ones
+    //
+    // the functions returns the flags (WS_XXX) directly and puts the ext
+    // (WS_EX_XXX) flags into the provided pointer if not NULL
+    WXDWORD OS2GetCreateWindowFlags(WXDWORD* pdwExflags = NULL) const
+        { return OS2GetStyle(GetWindowStyle(), pdwExflags); }
+
+
     // returns TRUE if the window has been created
     bool         OS2Create( PSZ            zClass
                            ,const char*    zTitle
@@ -526,7 +544,7 @@ protected:
 
     virtual void     DoCaptureMouse(void);
     virtual void     DoReleaseMouse(void);
-    
+
     // move the window to the specified location and resize it: this is called
     // from both DoSetSize() and DoSetClientSize() and would usually just call
     // ::WinSetWindowPos() except for composite controls which will want to arrange