Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Robin Dunn
2004-05-01 21:29:35 +00:00
parent 6e86701b83
commit abdb7725e1
6 changed files with 178 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gtk/toplevel.cpp
View File

@@ -30,6 +30,7 @@
#include "wx/log.h"
#include "wx/dialog.h"
#include "wx/msgdlg.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 )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxCHECK_VALID_WIDGET(FALSE);
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 )
{
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") );
@@ -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
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
wxCHECK_VALID_WIDGET_RET();
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 )
{
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);
@@ -860,8 +861,8 @@ void wxTopLevelWindowGTK::OnInternalIdle()
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 ) );
}
@@ -888,7 +889,7 @@ void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
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 );