wxFont can now raelly use the native fonts

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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 0f65290104f521a346e412c6acf450b785e3bc14..499a36e6899c14cc2bfb52212e85fb1264abbf17 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -146,7 +146,7 @@ gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WX
     if (g_isIdle)
         wxapp_install_idle_handler();
 
     if (g_isIdle)
         wxapp_install_idle_handler();
 

-    if (!win->m_hasVMT)
+    if (!win->m_hasVMT || !win->IsShown())

         return FALSE;
 
     int x = 0;
         return FALSE;
 
     int x = 0;


@@ -497,6 +497,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     m_isBeingDeleted = TRUE;
 wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     m_isBeingDeleted = TRUE;

+    
+    gtk_window_set_focus( GTK_WINDOW(m_widget), NULL );

 
     wxTopLevelWindows.DeleteObject( this );
 
 
     wxTopLevelWindows.DeleteObject( this );