Removing OS/2 specific positioning methods, no longer needed

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

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 2557c3981fbf398665b5f526f3c70baac7a5a9f5..a54b9d9602f40f9fbc17b4300c1a5f1904a0f974 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -83,11 +83,6 @@ public:
     // Implementation from now on
     // --------------------------
     //
-           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:
     //

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index aa2553e8fac385b66c73855f70f8353b8a1e63a6..66bdc201c66aa023c9cf44833ca482f796213a87 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -453,6 +453,7 @@ public:
                        );
 
     void MoveChildren(int nDiff);
+    PSWP GetSwp(void) {return &m_vWinSwp;}
 
 protected:
     // PM can't create some MSW styles natively but can perform these after
@@ -541,7 +542,6 @@ protected:
 #endif // wxUSE_TOOLTIPS
 
     int  GetOS2ParentHeight(wxWindowOS2* pParent);
-    virtual void OS2Layout(int nWidth, int nHeight);
 
 private:
     // common part of all ctors
@@ -572,6 +572,7 @@ private:
 private:
     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
+    SWP                             m_vWinSwp;
 
     // Virtual function hiding supression
     inline virtual bool Reparent(wxWindowBase* pNewParent)

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 51caf5929d1a2a46ecbe2b556e433c307f597828..f5a64871b74ce58cc6604a974d351416bf2b016b 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -122,15 +122,6 @@ public:
     // so should be there for all platforms
     void OnActivate(wxActivateEvent &WXUNUSED(event)) { }
 
-    // Override in derived, platfrom specific, class if your OS coordinate
-    // system uses anything other than the top left as 0,0.  The second
-    // 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)
-                                          ) { }
-
 protected:
     // the frame client to screen translation should take account of the
     // toolbar which may shift the origin of the client area

diff --git a/include/wx/window.h b/include/wx/window.h
index 6d6edb28f37291045bacb55eb5b3b4b98b6c3b2d..1035f06356f5840e3a8debd45c3e8f7a57521ac8 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -962,10 +962,6 @@ 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:
 

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index a67959b9f08d57bed7dd0dc3339c6805d4f01919..6c9f3d89f93f900afebe73228983d133f9f1c4c2 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -137,9 +137,6 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
             {
                 if ( child )
                 {
-#ifdef __WXPM__
-                    AlterChildPos();
-#endif
                     return;     // it's our second subwindow - nothing to do
                 }
 
@@ -162,14 +159,7 @@ void wxTopLevelWindowBase::OnSize(wxSizeEvent& WXUNUSED(event))
             static const int ofs = 0;
 #endif
 
-#ifdef __WXPM__
-            // OS/2 PM has to do a LOT of stuff to get things
-            // positioned right, especially if the child is a
-            // scrolled window.
-            UpdateInternalSize(child, clientW, clientH);
-#else
             child->SetSize(ofs, ofs, clientW - 2*ofs, clientH - 2*ofs);
-#endif
         }
     }
 }

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index b76a5c348caffb5714cfed9e7ce62931369babbc..26cdbc173e44b7d8ec5c09053fb60becf48f6270 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1194,9 +1194,6 @@ bool wxWindowBase::Layout()
         GetClientSize(&w, &h);
 
         GetSizer()->SetDimension( 0, 0, w, h );
-#if defined __WXPM__
-        OS2Layout(w, h);
-#endif
     }
     else
     {