In DialogEd, changed Close to Destroy to make it shut down properly.

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

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 4e9104c7a97b16baf85428e30b4a146f4edc5fdd..ae11c5097ebd23437632b0a8e3596b5f8e621195 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -142,6 +142,10 @@ bool wxFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
 
     m_widget = gtk_window_new( win_type );
 
 
     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))
     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 +163,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 );
 
     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",
     gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",


@@ -462,7 +470,7 @@ void wxFrame::OnSize( wxSizeEvent &WXUNUSED(event) )
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
             wxWindow *win = (wxWindow *)node->Data();
         for(wxNode *node = GetChildren().First(); node; node = node->Next())
         {
             wxWindow *win = (wxWindow *)node->Data();

-            if (!IS_KIND_OF(win,wxFrame) && !IS_KIND_OF(win,wxDialog)
+            if (!wxIS_KIND_OF(win,wxFrame) && !wxIS_KIND_OF(win,wxDialog)

 #if 0  // not in m_children anyway ?
               && (win != m_frameMenuBar) &&
               (win != m_frameToolBar) &&
 #if 0  // not in m_children anyway ?
               && (win != m_frameMenuBar) &&
               (win != m_frameToolBar) &&