To have better support for themed and custom backgrounds for wxMSW wxComboCtrl, use...

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 6c3104837b3157f1e0d03541abd11cbbbb15a24d..28f4fafcea6c4482373661397ffbf0b309b06952 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -380,16 +380,18 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
                           GdkEventWindowState *event,
                           wxTopLevelWindow *win )
 {
-    
-    if (event->changed_mask && GDK_WINDOW_STATE_ICONIFIED)
+    if (event->changed_mask & GDK_WINDOW_STATE_ICONIFIED)
+        win->SetIconizeState((event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) != 0);
+
+    // if maximized bit changed and it is now set
+    if (event->changed_mask & event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
     {
-        if (event->new_window_state && GDK_WINDOW_STATE_ICONIFIED)
-            win->SetIconizeState(true);
-        else
-            win->SetIconizeState(false);
+        wxMaximizeEvent event(win->GetId());
+        event.SetEventObject(win);
+        win->HandleWindowEvent(event);
     }
-    
-    return FALSE;
+
+    return false;
 }
 }
 
@@ -1150,7 +1152,7 @@ wxSize& wxTopLevelWindowGTK::GetCachedDecorSize()
 
 void wxTopLevelWindowGTK::OnInternalIdle()
 {
-    wxWindow::OnInternalIdle();
+    wxTopLevelWindowBase::OnInternalIdle();
 
     // Synthetize activate events.
     if ( g_sendActivateEvent != -1 )
@@ -1216,10 +1218,8 @@ void wxTopLevelWindowGTK::Maximize(bool maximize)
 
 bool wxTopLevelWindowGTK::IsMaximized() const
 {
-    if(!m_widget->window)
-        return false;
-
-    return gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED;
+    return m_widget->window &&
+        (gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED);
 }
 
 void wxTopLevelWindowGTK::Restore()