Rework idle handling so that NSApplication does not need to be subclassed or posed as.

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

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 0e3732b33a629c7df4f8164629e078668bda2016..027d3bf090b56d3141f3b61103f2e7bd9f8848b8 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -133,7 +133,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
         // These are outside the client area
         wxFrame* frame = (wxFrame*) parent;
         gtk_pizza_put( GTK_PIZZA(frame->m_mainWidget),
-                         GTK_WIDGET(child->m_widget),
+                         child->m_widget,
                          child->m_x,
                          child->m_y,
                          child->m_width,
@@ -161,7 +161,7 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
     {
         // These are inside the client area
         gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
-                         GTK_WIDGET(child->m_widget),
+                         child->m_widget,
                          child->m_x,
                          child->m_y,
                          child->m_width,
@@ -334,15 +334,7 @@ void wxFrame::GtkOnSize()
        skip the part which handles m_frameMenuBar, m_frameToolBar and (most
        importantly) m_mainWidget */
 
-    int minWidth = GetMinWidth(),
-        minHeight = GetMinHeight(),
-        maxWidth = GetMaxWidth(),
-        maxHeight = GetMaxHeight();
-
-    if ((minWidth != -1) && (m_width < minWidth)) m_width = minWidth;
-    if ((minHeight != -1) && (m_height < minHeight)) m_height = minHeight;
-    if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
-    if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
+    ConstrainSize();
 
     if (m_mainWidget)
     {