compilation fixes - wxGTK compiles but not links

[wxWidgets.git] / src / os2 / frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 457b71276766c78099dce7600ad9ecab1f9905ea..838197f4d40cb3df3eb1d6b03c085c9500d8782a 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -341,15 +341,9 @@ void wxFrame::DoGetPosition(
     POINTL                          vPoint;
 
     ::WinQueryWindowRect(m_hFrame, &vRect);
     POINTL                          vPoint;
 
     ::WinQueryWindowRect(m_hFrame, &vRect);

-    vPoint.x = vRect.xLeft;

 
 

-    //
-    // OS/2 is backwards [WIN32 it is vRect.yTop]
-    //
-    vPoint.y = vRect.yBottom;
-
-    *pX = vPoint.x;
-    *pY = vPoint.y;
+    *pX = vRect.xRight - vRect.xLeft;
+    *pY = vRect.yTop - vRect.yBottom;

 } // end of wxFrame::DoGetPosition
 
 // ----------------------------------------------------------------------------
 } // end of wxFrame::DoGetPosition
 
 // ----------------------------------------------------------------------------


@@ -1109,15 +1103,6 @@ void wxFrame::OnActivate(
     }
 } // end of wxFrame::OnActivate
 
     }
 } // end of wxFrame::OnActivate
 

-void wxFrame::RemoveChild(
-  wxWindowBase*                     pChild
-)
-{
-    if (pChild == m_pWinLastFocused)
-        m_pWinLastFocused = NULL;
-    wxFrameBase::RemoveChild(pChild);
-} // end of wxFrame::RemoveChild
-

 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 // from the client area, so the client area is what's really available for the


@@ -1365,6 +1350,7 @@ bool wxFrame::HandleSize(
             // restore all child frames too
             //
             IconizeChildFrames(FALSE);
             // restore all child frames too
             //
             IconizeChildFrames(FALSE);

+            (void)SendIconizeEvent(FALSE);

 
             //
             // fall through
 
             //
             // fall through


@@ -1379,6 +1365,7 @@ bool wxFrame::HandleSize(
             // Iconize all child frames too
             //
             IconizeChildFrames(TRUE);
             // Iconize all child frames too
             //
             IconizeChildFrames(TRUE);

+            (void)SendIconizeEvent();

             m_bIconized = TRUE;
             break;
     }
             m_bIconized = TRUE;
             break;
     }