X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/de1359180540b5c5e11eddd4c3d08db4e38d59ea..9f3362c440ef4c780d9a4bc8089de60a21d108bd:/src/gtk/frame.cpp?ds=sidebyside

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 8d0d64c9ca..d809e69266 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -19,6 +19,10 @@
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/dcclient.h"
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
@@ -87,6 +91,10 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
     win->m_x = event->x;
     win->m_y = event->y;
 
+    wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
+    mevent.SetEventObject( win );
+    win->GetEventHandler()->ProcessEvent( mevent );
+
     return FALSE;
 }
 
@@ -97,7 +105,6 @@ static gint gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventC
 BEGIN_EVENT_TABLE(wxFrame, wxWindow)
     EVT_SIZE(wxFrame::OnSize)
     EVT_CLOSE(wxFrame::OnCloseWindow)
-    EVT_IDLE(wxFrame::OnIdle)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame,wxWindow)
@@ -142,6 +149,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
+#ifdef __WXDEBUG__
+        debug_focus_in( m_widget, "wxFrame::m_widget", name );
+#endif
+
     if ((size.x != -1) && (size.y != -1))
         gtk_widget_set_usize( m_widget, m_width, m_height );
     if ((pos.x != -1) && (pos.y != -1))
@@ -159,6 +170,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
     gtk_widget_show( m_wxwindow );
     GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
 
+#ifdef __WXDEBUG__
+        debug_focus_in( m_wxwindow, "wxFrame::m_wxwindow", name );
+#endif
+
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
@@ -181,7 +196,16 @@ wxFrame::~wxFrame()
     if (m_frameToolBar) delete m_frameToolBar;
 
     wxTopLevelWindows.DeleteObject( this );
-    if (wxTopLevelWindows.Number() == 0) wxTheApp->ExitMainLoop();
+    
+    if (wxTheApp->GetTopWindow() == this)
+    {
+        wxTheApp->SetTopWindow( (wxWindow*) NULL );
+    }
+    
+    if (wxTopLevelWindows.Number() == 0)
+    {  
+        wxTheApp->ExitMainLoop();
+    }
 }
 
 bool wxFrame::Show( bool show )
@@ -275,8 +299,8 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
     if ((m_x != -1) || (m_y != -1))
     {
@@ -286,7 +310,7 @@ void wxFrame::SetSize( int x, int y, int width, int height, int sizeFlags )
 
     if ((m_width != old_width) || (m_height != old_height))
     {
-        gtk_widget_set_usize( m_widget, m_width, m_height );
+       gtk_widget_set_usize( m_widget, m_width, m_height );
     }
 
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -369,8 +393,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
     if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
     if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
-    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_minWidth;
-    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_minHeight;
+    if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+    if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
     gtk_widget_set_usize( m_widget, m_width, m_height );
 
@@ -382,9 +406,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameMenuBar)
     {
         int xx = m_miniEdge;
-  int yy = m_miniEdge + m_miniTitle;
-  int ww = m_width  - 2*m_miniEdge;
-  int hh = wxMENU_HEIGHT;
+        int yy = m_miniEdge + m_miniTitle;
+        int ww = m_width  - 2*m_miniEdge;
+        int hh = wxMENU_HEIGHT;
         m_frameMenuBar->m_x = xx;
         m_frameMenuBar->m_y = yy;
         m_frameMenuBar->m_width = ww;
@@ -397,9 +421,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameToolBar)
     {
         int xx = m_miniEdge;
-  int yy = m_miniEdge + m_miniTitle;
+        int yy = m_miniEdge + m_miniTitle;
         if (m_frameMenuBar) yy += wxMENU_HEIGHT;
-  int ww = m_width - 2*m_miniEdge;
+        int ww = m_width - 2*m_miniEdge;
         int hh = m_frameToolBar->m_height;
 
         m_frameToolBar->m_x = xx;
@@ -414,9 +438,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
     if (m_frameStatusBar)
     {
         int xx = 0 + m_miniEdge;
-  int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
-  int ww = m_width - 2*m_miniEdge;
-  int hh = wxSTATUS_HEIGHT;
+        int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
+        int ww = m_width - 2*m_miniEdge;
+        int hh = wxSTATUS_HEIGHT;
 
         m_frameStatusBar->m_x = xx;
         m_frameStatusBar->m_y = yy;
@@ -429,14 +453,25 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
 
     m_sizeSet = TRUE;
 
+    /* send size event to frame */
+
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
     event.SetEventObject( this );
     GetEventHandler()->ProcessEvent( event );
 
+    /* send size event to status bar */
+
+    if (m_frameStatusBar)
+    {
+        wxSizeEvent event2( wxSize(m_frameStatusBar->m_width,m_frameStatusBar->m_height), m_frameStatusBar->GetId() );
+        event2.SetEventObject( m_frameStatusBar );
+        m_frameStatusBar->GetEventHandler()->ProcessEvent( event2 );
+    }
+
     m_resizing = FALSE;
 }
 
-void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
+void wxFrame::OnInternalIdle()
 {
     if (!m_sizeSet)
         GtkOnSize( m_x, m_y, m_width, m_height );
@@ -521,7 +556,7 @@ void wxFrame::SetMenuBar( wxMenuBar *menuBar )
         }
     }
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    m_sizeSet = FALSE;
 }
 
 wxMenuBar *wxFrame::GetMenuBar() const
@@ -539,7 +574,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
 
     GetChildren().DeleteObject( m_frameToolBar );
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    m_sizeSet = FALSE;
 
     return m_frameToolBar;
 }
@@ -562,7 +597,7 @@ wxStatusBar* wxFrame::CreateStatusBar( int number, long style, wxWindowID id, co
 
     m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
 
-    if (m_sizeSet) GtkOnSize( m_x, m_y, m_width, m_height );
+    m_sizeSet = FALSE;
 
     return m_frameStatusBar;
 }