OS/2 scrolling support

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

include/wx/os2/region.h

@@ -33,8 +33,6 @@ enum wxRegionOp { wxRGN_AND         // Creates the intersection of the two combi
 
 class WXDLLEXPORT wxRegion : public wxGDIObject
 {
-DECLARE_DYNAMIC_CLASS(wxRegion);
-    friend class WXDLLEXPORT wxRegionIterator;
 public:
     wxRegion( wxCoord x
              ,wxCoord y
@@ -67,6 +65,10 @@ public:
     //
     void Clear(void);
 
+    bool Offset( wxCoord x
+                ,wxCoord y
+               );
+
     //
     // Union rectangle or region with this.
     //
@@ -208,6 +210,14 @@ public:
     //
     WXHRGN GetHRGN(void) const;
     void   SetPS(HPS hPS);
+
+protected:
+    virtual wxObjectRefData* CreateData(void) const;
+    virtual wxObjectRefData* CloneData(wxObjectRefData* pData) const;
+    
+    friend class WXDLLEXPORT wxRegionIterator;
+    DECLARE_DYNAMIC_CLASS(wxRegion);
+
 }; // end of CLASS wxRegion
 
 class WXDLLEXPORT wxRegionIterator : public wxObject

include/wx/os2/toplevel.h

@@ -85,8 +85,10 @@ public:
     //
            virtual void AlterChildPos(void); // OS/2 child control positioning
            virtual void UpdateInternalSize( wxWindow* pChild
+                                           ,int       nWidth
                                            ,int       nHeight
                                           );
+           PSWP         GetSwpClient(void) { return &m_vSwpClient; }
 protected:
     //
     // Common part of all ctors
@@ -157,6 +159,7 @@ protected:
     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
+    static bool                     m_sbInitialized;
 }; // end of CLASS wxTopLevelWindowOS2
 
 //

include/wx/os2/window.h

@@ -142,6 +142,8 @@ public:
                                   ,const wxRect* pRect = (wxRect *)NULL
                                  );
 
+    inline HWND                   GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
+    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;};
 #if wxUSE_DRAG_AND_DROP
     virtual void SetDropTarget(wxDropTarget* pDropTarget);
 #endif // wxUSE_DRAG_AND_DROP
@@ -539,6 +541,7 @@ protected:
 #endif // wxUSE_TOOLTIPS
 
     int  GetOS2ParentHeight(wxWindowOS2* pParent);
+    virtual void OS2Layout(int nWidth, int nHeight);
 
 private:
     // common part of all ctors
@@ -561,9 +564,11 @@ private:
     // the helper functions used by HandleChar/KeyXXX methods
     wxKeyEvent CreateKeyEvent(wxEventType evType, int id, WXLPARAM lp) const;
 
+
     DECLARE_DYNAMIC_CLASS(wxWindowOS2);
     DECLARE_NO_COPY_CLASS(wxWindowOS2)
     DECLARE_EVENT_TABLE()
+
 private:
     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;

include/wx/toplevel.h

@@ -127,6 +127,7 @@ public:
     // method updates any internal sizing parameters such as OS/2's SWP struct
     inline virtual void AlterChildPos(void) { }
     inline virtual void UpdateInternalSize( wxWindow* WXUNUSED(pChild)
+                                           ,int WXUNUSED(nWidth)
                                            ,int WXUNUSED(nHeight)
                                           ) { }
 

include/wx/window.h

@@ -845,6 +845,7 @@ protected:
     bool                 m_themeEnabled;
 
 protected:
+
     // common part of all ctors: it is not virtual because it is called from
     // ctor
     void InitBase();
@@ -935,7 +936,13 @@ protected:
     // a toolbar that it manages itself).
     virtual void AdjustForParentClientOrigin(int& x, int& y, int sizeFlags);
 
+#ifdef __WXPM__
+    // extra OS/2 layout processing
+    virtual void OS2Layout(int width, int height) { };
+#endif
+
 private:
+
     // contains the last id generated by NewControlId
     static int ms_lastControlId;