In wxGTK2 the wxMessageDialog is not a real wxDialog so its m_widget

will always be NULL there will be a wxCHECK asserts triggered whenever
calling base class methods that are valid calls (or just ignored) on
other wx ports.  Added a set of macros to be used to test m_widget
that will bypass the wxFAIL if the window is a wxMessageDialog.  This
will silence those asserts if the window is a wxMessageDialog and will
let the method doing the check just be ignored in that case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index d63519da52a7d34d084680bc0daf9bc942f76410..50d08255011037cf141a8c45dfb1499e75031dad 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -131,5 +131,39 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 

+
+
+// In wxGTK2 the wxMessageDialog is not a real wxDialog, instead a
+// gtk_message_dialog is created, shown and destroyed inside the ShowModal()
+// call.  Since its m_widget will always be NULL there would normally be lots
+// of wxCHECK asserts triggered by calling base class methods that are valid
+// calls (or just ignored) on other wx ports.  Using these macros instead of
+// wxCHECK will silence those asserts if the window is a wxMessageDialog and
+// will let the method doing the check just be ignored in that case.  If it's
+// not a wxMessageDialog then it behaves just like before.
+//
+// NOTE: Once more native dialogs are used then this will need to be
+//       generalized a bit, perhaps with a IsNativeGTKDialog method or
+//       something...
+
+#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#define wxCHECK_VALID_WIDGET(rc)   \
+    if (!(m_widget != NULL)) { \
+        if (!wxIsKindOf(this, wxMessageDialog)) { wxFAIL_MSG(wxT("invalid window")); } \
+        return rc; \
+    }
+
+#define wxCHECK_VALID_WIDGET_RET()    \
+    if (!(m_widget != NULL)) { \
+        if (!wxIsKindOf(this, wxMessageDialog)) { wxFAIL_MSG(wxT("invalid window")); } \
+        return; \
+    }
+
+#else  // not wxGTK2, so just use wxCHECK
+#define wxCHECK_VALID_WIDGET(rc)   wxCHECK_MSG( (m_widget != NULL), rc, wxT("invalid window") )
+#define wxCHECK_VALID_WIDGET_RET() wxCHECK_RET( (m_widget != NULL),     wxT("invalid window") );
+#endif
+
+

 #endif // _WX_GTK_PRIVATE_H_
 
 #endif // _WX_GTK_PRIVATE_H_
 

diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h
index d63519da52a7d34d084680bc0daf9bc942f76410..50d08255011037cf141a8c45dfb1499e75031dad 100644 (file)
--- a/include/wx/gtk1/private.h
+++ b/include/wx/gtk1/private.h
@@ -131,5 +131,39 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 
             wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
 }
 

+
+
+// In wxGTK2 the wxMessageDialog is not a real wxDialog, instead a
+// gtk_message_dialog is created, shown and destroyed inside the ShowModal()
+// call.  Since its m_widget will always be NULL there would normally be lots
+// of wxCHECK asserts triggered by calling base class methods that are valid
+// calls (or just ignored) on other wx ports.  Using these macros instead of
+// wxCHECK will silence those asserts if the window is a wxMessageDialog and
+// will let the method doing the check just be ignored in that case.  If it's
+// not a wxMessageDialog then it behaves just like before.
+//
+// NOTE: Once more native dialogs are used then this will need to be
+//       generalized a bit, perhaps with a IsNativeGTKDialog method or
+//       something...
+
+#if wxUSE_MSGDLG && defined(__WXGTK20__) && !defined(__WXGPE__)
+#define wxCHECK_VALID_WIDGET(rc)   \
+    if (!(m_widget != NULL)) { \
+        if (!wxIsKindOf(this, wxMessageDialog)) { wxFAIL_MSG(wxT("invalid window")); } \
+        return rc; \
+    }
+
+#define wxCHECK_VALID_WIDGET_RET()    \
+    if (!(m_widget != NULL)) { \
+        if (!wxIsKindOf(this, wxMessageDialog)) { wxFAIL_MSG(wxT("invalid window")); } \
+        return; \
+    }
+
+#else  // not wxGTK2, so just use wxCHECK
+#define wxCHECK_VALID_WIDGET(rc)   wxCHECK_MSG( (m_widget != NULL), rc, wxT("invalid window") )
+#define wxCHECK_VALID_WIDGET_RET() wxCHECK_RET( (m_widget != NULL),     wxT("invalid window") );
+#endif
+
+

 #endif // _WX_GTK_PRIVATE_H_
 
 #endif // _WX_GTK_PRIVATE_H_
 

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index b4a0ed8489592ba1856e716e9705b6fa0d14a76f..75371738e9bff27bc767d503b6196121d08fd663 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -30,6 +30,7 @@
 
 #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"


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

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

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


@@ -601,8 +602,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 )
 {

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

     // 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") );
 


@@ -688,8 +689,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
 {

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

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


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

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

 
     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);


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

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

     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 ) );
 }


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

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

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

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ddf29e51e6cce852b4a20a8bae11997ee3c182e6..62834cbe2fc199d12183e28f423cadc85649bdab 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2818,8 +2818,8 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos,  const w
 
 void wxWindowGTK::PostCreation()
 {
 
 void wxWindowGTK::PostCreation()
 {

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

     if (m_wxwindow)
     {
         if (!m_noExpose)
     if (m_wxwindow)
     {
         if (!m_noExpose)


@@ -2954,7 +2954,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
 
 bool wxWindowGTK::Destroy()
 {
 
 bool wxWindowGTK::Destroy()
 {

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

 
     m_hasVMT = FALSE;
 
 
     m_hasVMT = FALSE;
 


@@ -2968,7 +2968,7 @@ void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
 
 void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

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

     wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
 
 /*
     wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
 
 /*


@@ -3149,7 +3149,7 @@ void wxWindowGTK::OnInternalIdle()
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const
 {
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (width) (*width) = m_width;
     if (height) (*height) = m_height;
 
     if (width) (*width) = m_width;
     if (height) (*height) = m_height;


@@ -3157,8 +3157,8 @@ void wxWindowGTK::DoGetSize( int *width, int *height ) const
 
 void wxWindowGTK::DoSetClientSize( int width, int height )
 {
 
 void wxWindowGTK::DoSetClientSize( int width, int height )
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_wxwindow)
     {
         SetSize( width, height );
     if (!m_wxwindow)
     {
         SetSize( width, height );


@@ -3220,7 +3220,7 @@ void wxWindowGTK::DoSetClientSize( int width, int height )
 
 void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_wxwindow)
     {
 
     if (!m_wxwindow)
     {


@@ -3292,7 +3292,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 
 void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     int dx = 0;
     int dy = 0;
 
     int dx = 0;
     int dy = 0;


@@ -3309,7 +3309,7 @@ void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 
 void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 


@@ -3338,7 +3338,7 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 
 void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 


@@ -3367,7 +3367,7 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 
 bool wxWindowGTK::Show( bool show )
 {
 
 bool wxWindowGTK::Show( bool show )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::Show(show))
     {
 
     if (!wxWindowBase::Show(show))
     {


@@ -3407,8 +3407,8 @@ static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
 
 bool wxWindowGTK::Enable( bool enable )
 {
 
 bool wxWindowGTK::Enable( bool enable )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET(FALSE);
+    

     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do


@@ -3426,7 +3426,7 @@ bool wxWindowGTK::Enable( bool enable )
 
 int wxWindowGTK::GetCharHeight() const
 {
 
 int wxWindowGTK::GetCharHeight() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(12);

 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );
 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );


@@ -3460,7 +3460,7 @@ int wxWindowGTK::GetCharHeight() const
 
 int wxWindowGTK::GetCharWidth() const
 {
 
 int wxWindowGTK::GetCharWidth() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(8);

 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );
 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );


@@ -3561,7 +3561,7 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
 
 void wxWindowGTK::SetFocus()
 {
 
 void wxWindowGTK::SetFocus()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if ( m_hasFocus )
     {
 
     if ( m_hasFocus )
     {


@@ -3620,7 +3620,7 @@ bool wxWindowGTK::AcceptsFocus() const
 
 bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
 {
 
 bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     wxWindowGTK *oldParent = m_parent,
              *newParent = (wxWindowGTK *)newParentBase;
 
     wxWindowGTK *oldParent = m_parent,
              *newParent = (wxWindowGTK *)newParentBase;


@@ -3671,8 +3671,8 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child)
 
 void wxWindowGTK::Raise()
 {
 
 void wxWindowGTK::Raise()
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_widget->window) return;
 
     gdk_window_raise( m_widget->window );
     if (!m_widget->window) return;
 
     gdk_window_raise( m_widget->window );


@@ -3680,8 +3680,8 @@ void wxWindowGTK::Raise()
 
 void wxWindowGTK::Lower()
 {
 
 void wxWindowGTK::Lower()
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_widget->window) return;
 
     gdk_window_lower( m_widget->window );
     if (!m_widget->window) return;
 
     gdk_window_lower( m_widget->window );


@@ -3689,7 +3689,7 @@ void wxWindowGTK::Lower()
 
 bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 {
 
 bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (cursor == m_cursor)
        return FALSE;
 
     if (cursor == m_cursor)
        return FALSE;


@@ -3705,8 +3705,8 @@ bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 
 void wxWindowGTK::WarpPointer( int x, int y )
 {
 
 void wxWindowGTK::WarpPointer( int x, int y )
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 
     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 


@@ -3977,8 +3977,8 @@ void wxWindowGTK::GtkSendPaintEvents()
 
 void wxWindowGTK::ClearBackground()
 {
 
 void wxWindowGTK::ClearBackground()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

 #ifndef __WXGTK20__
     if (m_wxwindow && m_wxwindow->window)
     {
 #ifndef __WXGTK20__
     if (m_wxwindow && m_wxwindow->window)
     {


@@ -4032,7 +4032,7 @@ void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour )
 
 bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
 {
 
 bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::SetBackgroundColour(colour))
         return FALSE;
 
     if (!wxWindowBase::SetBackgroundColour(colour))
         return FALSE;


@@ -4074,7 +4074,7 @@ void wxWindowGTK::GtkSetForegroundColour( const wxColour &colour )
 
 bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
 {
 
 bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::SetForegroundColour(colour))
     {
 
     if (!wxWindowBase::SetForegroundColour(colour))
     {


@@ -4307,7 +4307,7 @@ extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
 
 bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {
 
 bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
 
 
     wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
 


@@ -4354,8 +4354,8 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
 void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
 {
 
 void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     GtkWidget *dnd_widget = GetConnectWidget();
 
     if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
     GtkWidget *dnd_widget = GetConnectWidget();
 
     if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );


@@ -4408,8 +4408,8 @@ bool wxWindowGTK::SetFont( const wxFont &font )
 
 void wxWindowGTK::DoCaptureMouse()
 {
 
 void wxWindowGTK::DoCaptureMouse()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;
     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;


@@ -4437,8 +4437,8 @@ void wxWindowGTK::DoCaptureMouse()
 
 void wxWindowGTK::DoReleaseMouse()
 {
 
 void wxWindowGTK::DoReleaseMouse()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
     g_captureWindow = (wxWindowGTK*) NULL;
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
     g_captureWindow = (wxWindowGTK*) NULL;


@@ -4469,8 +4469,8 @@ bool wxWindowGTK::IsRetained() const
 void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
       int range, bool refresh )
 {
 void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
       int range, bool refresh )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     m_hasScrolling = TRUE;
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     m_hasScrolling = TRUE;


@@ -4532,7 +4532,7 @@ void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
 
 void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 {
 
 void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 


@@ -4584,8 +4584,8 @@ void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 
 int wxWindowGTK::GetScrollThumb( int orient ) const
 {
 
 int wxWindowGTK::GetScrollThumb( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET(0);
+    

     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
     if (orient == wxHORIZONTAL)
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
     if (orient == wxHORIZONTAL)


@@ -4596,7 +4596,7 @@ int wxWindowGTK::GetScrollThumb( int orient ) const
 
 int wxWindowGTK::GetScrollPos( int orient ) const
 {
 
 int wxWindowGTK::GetScrollPos( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(0);

 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 


@@ -4608,7 +4608,7 @@ int wxWindowGTK::GetScrollPos( int orient ) const
 
 int wxWindowGTK::GetScrollRange( int orient ) const
 {
 
 int wxWindowGTK::GetScrollRange( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(0);

 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 


@@ -4620,8 +4620,8 @@ int wxWindowGTK::GetScrollRange( int orient ) const
 
 void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 {
 
 void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     // No scrolling requested.
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     // No scrolling requested.

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index b4a0ed8489592ba1856e716e9705b6fa0d14a76f..75371738e9bff27bc767d503b6196121d08fd663 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -30,6 +30,7 @@
 
 #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"


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

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

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


@@ -601,8 +602,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 )
 {

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

     // 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") );
 


@@ -688,8 +689,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
 {

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

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


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

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

 
     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);


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

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

     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 ) );
 }


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

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

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

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index ddf29e51e6cce852b4a20a8bae11997ee3c182e6..62834cbe2fc199d12183e28f423cadc85649bdab 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2818,8 +2818,8 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos,  const w
 
 void wxWindowGTK::PostCreation()
 {
 
 void wxWindowGTK::PostCreation()
 {

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

     if (m_wxwindow)
     {
         if (!m_noExpose)
     if (m_wxwindow)
     {
         if (!m_noExpose)


@@ -2954,7 +2954,7 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget )
 
 bool wxWindowGTK::Destroy()
 {
 
 bool wxWindowGTK::Destroy()
 {

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

 
     m_hasVMT = FALSE;
 
 
     m_hasVMT = FALSE;
 


@@ -2968,7 +2968,7 @@ void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
 
 void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
 
 void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {

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

     wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
 
 /*
     wxASSERT_MSG( (m_parent != NULL), wxT("wxWindowGTK::SetSize requires parent.\n") );
 
 /*


@@ -3149,7 +3149,7 @@ void wxWindowGTK::OnInternalIdle()
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const
 {
 
 void wxWindowGTK::DoGetSize( int *width, int *height ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (width) (*width) = m_width;
     if (height) (*height) = m_height;
 
     if (width) (*width) = m_width;
     if (height) (*height) = m_height;


@@ -3157,8 +3157,8 @@ void wxWindowGTK::DoGetSize( int *width, int *height ) const
 
 void wxWindowGTK::DoSetClientSize( int width, int height )
 {
 
 void wxWindowGTK::DoSetClientSize( int width, int height )
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_wxwindow)
     {
         SetSize( width, height );
     if (!m_wxwindow)
     {
         SetSize( width, height );


@@ -3220,7 +3220,7 @@ void wxWindowGTK::DoSetClientSize( int width, int height )
 
 void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 {
 
 void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_wxwindow)
     {
 
     if (!m_wxwindow)
     {


@@ -3292,7 +3292,7 @@ void wxWindowGTK::DoGetClientSize( int *width, int *height ) const
 
 void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     int dx = 0;
     int dy = 0;
 
     int dx = 0;
     int dy = 0;


@@ -3309,7 +3309,7 @@ void wxWindowGTK::DoGetPosition( int *x, int *y ) const
 
 void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 


@@ -3338,7 +3338,7 @@ void wxWindowGTK::DoClientToScreen( int *x, int *y ) const
 
 void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 {
 
 void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if (!m_widget->window) return;
 
 
     if (!m_widget->window) return;
 


@@ -3367,7 +3367,7 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const
 
 bool wxWindowGTK::Show( bool show )
 {
 
 bool wxWindowGTK::Show( bool show )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::Show(show))
     {
 
     if (!wxWindowBase::Show(show))
     {


@@ -3407,8 +3407,8 @@ static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
 
 bool wxWindowGTK::Enable( bool enable )
 {
 
 bool wxWindowGTK::Enable( bool enable )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET(FALSE);
+    

     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do
     if (!wxWindowBase::Enable(enable))
     {
         // nothing to do


@@ -3426,7 +3426,7 @@ bool wxWindowGTK::Enable( bool enable )
 
 int wxWindowGTK::GetCharHeight() const
 {
 
 int wxWindowGTK::GetCharHeight() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(12);

 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );
 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );


@@ -3460,7 +3460,7 @@ int wxWindowGTK::GetCharHeight() const
 
 int wxWindowGTK::GetCharWidth() const
 {
 
 int wxWindowGTK::GetCharWidth() const
 {

-    wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(8);

 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );
 
     wxFont font = GetFont();
     wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );


@@ -3561,7 +3561,7 @@ void wxWindowGTK::GetTextExtent( const wxString& string,
 
 void wxWindowGTK::SetFocus()
 {
 
 void wxWindowGTK::SetFocus()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     if ( m_hasFocus )
     {
 
     if ( m_hasFocus )
     {


@@ -3620,7 +3620,7 @@ bool wxWindowGTK::AcceptsFocus() const
 
 bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
 {
 
 bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     wxWindowGTK *oldParent = m_parent,
              *newParent = (wxWindowGTK *)newParentBase;
 
     wxWindowGTK *oldParent = m_parent,
              *newParent = (wxWindowGTK *)newParentBase;


@@ -3671,8 +3671,8 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child)
 
 void wxWindowGTK::Raise()
 {
 
 void wxWindowGTK::Raise()
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_widget->window) return;
 
     gdk_window_raise( m_widget->window );
     if (!m_widget->window) return;
 
     gdk_window_raise( m_widget->window );


@@ -3680,8 +3680,8 @@ void wxWindowGTK::Raise()
 
 void wxWindowGTK::Lower()
 {
 
 void wxWindowGTK::Lower()
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     if (!m_widget->window) return;
 
     gdk_window_lower( m_widget->window );
     if (!m_widget->window) return;
 
     gdk_window_lower( m_widget->window );


@@ -3689,7 +3689,7 @@ void wxWindowGTK::Lower()
 
 bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 {
 
 bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 {

-    wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (cursor == m_cursor)
        return FALSE;
 
     if (cursor == m_cursor)
        return FALSE;


@@ -3705,8 +3705,8 @@ bool wxWindowGTK::SetCursor( const wxCursor &cursor )
 
 void wxWindowGTK::WarpPointer( int x, int y )
 {
 
 void wxWindowGTK::WarpPointer( int x, int y )
 {

-    wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 
     // We provide this function ourselves as it is
     // missing in GDK (top of this file).
 


@@ -3977,8 +3977,8 @@ void wxWindowGTK::GtkSendPaintEvents()
 
 void wxWindowGTK::ClearBackground()
 {
 
 void wxWindowGTK::ClearBackground()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

 #ifndef __WXGTK20__
     if (m_wxwindow && m_wxwindow->window)
     {
 #ifndef __WXGTK20__
     if (m_wxwindow && m_wxwindow->window)
     {


@@ -4032,7 +4032,7 @@ void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour )
 
 bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
 {
 
 bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::SetBackgroundColour(colour))
         return FALSE;
 
     if (!wxWindowBase::SetBackgroundColour(colour))
         return FALSE;


@@ -4074,7 +4074,7 @@ void wxWindowGTK::GtkSetForegroundColour( const wxColour &colour )
 
 bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
 {
 
 bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     if (!wxWindowBase::SetForegroundColour(colour))
     {
 
     if (!wxWindowBase::SetForegroundColour(colour))
     {


@@ -4307,7 +4307,7 @@ extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
 
 bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {
 
 bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 {

-    wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(FALSE);

 
     wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
 
 
     wxCHECK_MSG( menu != NULL, FALSE, wxT("invalid popup-menu") );
 


@@ -4354,8 +4354,8 @@ bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
 
 void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
 {
 
 void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     GtkWidget *dnd_widget = GetConnectWidget();
 
     if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
     GtkWidget *dnd_widget = GetConnectWidget();
 
     if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );


@@ -4408,8 +4408,8 @@ bool wxWindowGTK::SetFont( const wxFont &font )
 
 void wxWindowGTK::DoCaptureMouse()
 {
 
 void wxWindowGTK::DoCaptureMouse()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;
     GdkWindow *window = (GdkWindow*) NULL;
     if (m_wxwindow)
         window = GTK_PIZZA(m_wxwindow)->bin_window;


@@ -4437,8 +4437,8 @@ void wxWindowGTK::DoCaptureMouse()
 
 void wxWindowGTK::DoReleaseMouse()
 {
 
 void wxWindowGTK::DoReleaseMouse()
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
     g_captureWindow = (wxWindowGTK*) NULL;
     wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
 
     g_captureWindow = (wxWindowGTK*) NULL;


@@ -4469,8 +4469,8 @@ bool wxWindowGTK::IsRetained() const
 void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
       int range, bool refresh )
 {
 void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
       int range, bool refresh )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     m_hasScrolling = TRUE;
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     m_hasScrolling = TRUE;


@@ -4532,7 +4532,7 @@ void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
 
 void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 {
 
 void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET_RET();

 
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 


@@ -4584,8 +4584,8 @@ void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
 
 int wxWindowGTK::GetScrollThumb( int orient ) const
 {
 
 int wxWindowGTK::GetScrollThumb( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET(0);
+    

     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
     if (orient == wxHORIZONTAL)
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
     if (orient == wxHORIZONTAL)


@@ -4596,7 +4596,7 @@ int wxWindowGTK::GetScrollThumb( int orient ) const
 
 int wxWindowGTK::GetScrollPos( int orient ) const
 {
 
 int wxWindowGTK::GetScrollPos( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(0);

 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 


@@ -4608,7 +4608,7 @@ int wxWindowGTK::GetScrollPos( int orient ) const
 
 int wxWindowGTK::GetScrollRange( int orient ) const
 {
 
 int wxWindowGTK::GetScrollRange( int orient ) const
 {

-    wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid window") );
+    wxCHECK_VALID_WIDGET(0);

 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 
 
     wxCHECK_MSG( m_wxwindow != NULL, 0, wxT("window needs client area for scrolling") );
 


@@ -4620,8 +4620,8 @@ int wxWindowGTK::GetScrollRange( int orient ) const
 
 void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 {
 
 void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) )
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
+    wxCHECK_VALID_WIDGET_RET();
+    

     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     // No scrolling requested.
     wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
 
     // No scrolling requested.