correct GetBestSize() to return correct best size, i.e. the same size as AutoSize...

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index a0d2574eb5d5a863a3df4ec4f7257c2ac64b657b..fc5605303fed4ce993ff89eff6a8cb1c8ed50e7a 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -912,16 +912,13 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
     {
         if ((m_x != old_x) || (m_y != old_y))
         {
-            gtk_widget_set_uposition( m_widget, m_x, m_y );
+            gtk_window_move( GTK_WINDOW(m_widget), m_x, m_y );
         }
     }
 
     if ((m_width != old_width) || (m_height != old_height))
     {
-        if (m_widget->window)
-            gdk_window_resize( m_widget->window, m_width, m_height );
-        else
-            gtk_window_set_default_size( GTK_WINDOW(m_widget), m_width, m_height );
+        gtk_window_resize( GTK_WINDOW(m_widget), m_width, m_height );
 
         /* we set the size in GtkOnSize, i.e. mostly the actual resizing is
            done either directly before the frame is shown or in idle time
@@ -958,16 +955,6 @@ void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
               width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);
 }
 
-void wxTopLevelWindowGTK::SetMinSize(const wxSize& minSize)
-{
-    SetSizeHints( minSize.x, minSize.y, GetMaxWidth(), GetMaxHeight() );    
-}
-
-void wxTopLevelWindowGTK::SetMaxSize(const wxSize& maxSize)
-{
-    SetSizeHints( GetMinWidth(), GetMinHeight(), maxSize.x, maxSize.y );
-}
-
 void wxTopLevelWindowGTK::DoSetSizeHints( int minW, int minH,
                                           int maxW, int maxH,
                                           int incW, int incH )
@@ -1397,8 +1384,7 @@ bool wxTopLevelWindowGTK::CanSetTransparent()
 #if GTK_CHECK_VERSION(2,10,0)
     if (!gtk_check_version(2,10,0))
     {
-        if (gtk_widget_is_composited (m_widget))
-            return true;
+        return (gtk_widget_is_composited (m_widget));
     }
     else
 #endif // In case of lower versions than gtk+-2.10.0 we could look for _NET_WM_CM_Sn ourselves