fixed wrong return value and child creation login in GetWindowChild() (includes patch...

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 904220c40be79ceedb2cc02f81b6fef050a14210..a60402b336207ec40793c70e4c077e9c8e78c36c 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -26,15 +26,15 @@
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"

+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/dialog.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"
+    #include "wx/control.h"

 #endif
 
 #endif
 

-#include "wx/dialog.h"
-#include "wx/control.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

-#include "wx/timer.h"
-#include "wx/settings.h"

 #include "wx/evtloop.h"
 
 #include <glib.h>
 #include "wx/evtloop.h"
 
 #include <glib.h>


@@ -54,8 +54,6 @@
 // data
 // ----------------------------------------------------------------------------
 
 // data
 // ----------------------------------------------------------------------------
 

-extern wxList           wxPendingDelete;
-

 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 
 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 


@@ -558,8 +556,10 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent,
     }
 #endif
 
     }
 #endif
 

+#if 0

     if (!name.empty())
     if (!name.empty())

-        gtk_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) );
+        gtk_window_set_role( GTK_WINDOW(m_widget), wxGTK_CONV( name ) );
+#endif

 
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
 
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
     GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );


@@ -676,7 +676,7 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK()
 {
     if (m_grabbed)
     {
 {
     if (m_grabbed)
     {

-        wxASSERT_MSG( false, _T("Window still grabbed"));
+        wxFAIL_MSG(_T("Window still grabbed"));

         RemoveGrab();
     }
 
         RemoveGrab();
     }