Use gtk_init_check instead of gtk_init so that we can racefully exit

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

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 75371738e9bff27bc767d503b6196121d08fd663..b4a0ed8489592ba1856e716e9705b6fa0d14a76f 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -30,7 +30,6 @@
 
 #include "wx/log.h"
 #include "wx/dialog.h"
 
 #include "wx/log.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

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


@@ -580,7 +579,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
 
 bool wxTopLevelWindowGTK::Show( bool show )
 {
 
 bool wxTopLevelWindowGTK::Show( bool show )
 {

-    wxCHECK_VALID_WIDGET(FALSE);
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
     if (show && !m_sizeSet)
     {
 
     if (show && !m_sizeSet)
     {


@@ -602,8 +601,8 @@ void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXU
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 
     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
 


@@ -689,8 +688,8 @@ void wxTopLevelWindowGTK::DoSetSize( int x, int y, int width, int height, int si
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     wxWindow::DoGetClientSize( width, height );
     if (height)
     {
     wxWindow::DoGetClientSize( width, height );
     if (height)
     {


@@ -705,7 +704,7 @@ void wxTopLevelWindowGTK::DoGetClientSize( int *width, int *height ) const
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {
 
 void wxTopLevelWindowGTK::DoSetClientSize( int width, int height )
 {

-    wxCHECK_VALID_WIDGET_RET();
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

 
     DoSetSize(-1, -1,
               width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);
 
     DoSetSize(-1, -1,
               width + m_miniEdge*2, height  + m_miniEdge*2 + m_miniTitle, 0);


@@ -861,8 +860,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
 
 void wxTopLevelWindowGTK::SetTitle( const wxString &title )
 {
 
 void wxTopLevelWindowGTK::SetTitle( const wxString &title )
 {

-    wxCHECK_VALID_WIDGET_RET();
-    
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
+

     m_title = title;
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }
     m_title = title;
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }


@@ -889,7 +888,7 @@ void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
 
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
 
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {

-    wxCHECK_VALID_WIDGET_RET();
+    wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

     GdkWindow* window = m_widget->window;
 
     wxTopLevelWindowBase::SetIcons( icons );
     GdkWindow* window = m_widget->window;
 
     wxTopLevelWindowBase::SetIcons( icons );