wxMimeTypesManagerImpl::GetFileTypeFromMimeType() implemented

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index ec90e4e7e2f38f119b458f3936313b15ad08437c..993bbbf75b240d67a1be76ccff89c4195e31b098 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -193,7 +193,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 )
@@ -394,9 +403,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;
@@ -409,9 +418,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;
@@ -426,9 +435,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;