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

Fixed wxApp::OnAssert signature.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-06-15 01:43:03 +00:00
parent 238d33aa53
commit be88a6ade9
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/app.h
View File

@@ -61,7 +61,7 @@ public:
void DeletePendingObjects(); void DeletePendingObjects();
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
virtual void OnAssert(const wxChar *file, int line, const wxChar *msg); virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
bool IsInAssert() const { return m_isInAssert; } bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__ #endif // __WXDEBUG__
@@ -80,7 +80,7 @@ public:
// This returns the current visual: either that used by wxRootWindow // This returns the current visual: either that used by wxRootWindow
// or the XVisualInfo* for SGI. // or the XVisualInfo* for SGI.
GdkVisual *GetGdkVisual(); GdkVisual *GetGdkVisual();
private: private:
// true if we're inside an assert modal dialog // true if we're inside an assert modal dialog
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@@ -88,7 +88,7 @@ private:
#endif // __WXDEBUG__ #endif // __WXDEBUG__
bool CallInternalIdle( wxWindow* win ); bool CallInternalIdle( wxWindow* win );
DECLARE_DYNAMIC_CLASS(wxApp) DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

6
include/wx/gtk1/app.h
View File

@@ -61,7 +61,7 @@ public:
void DeletePendingObjects(); void DeletePendingObjects();
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
virtual void OnAssert(const wxChar *file, int line, const wxChar *msg); virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
bool IsInAssert() const { return m_isInAssert; } bool IsInAssert() const { return m_isInAssert; }
#endif // __WXDEBUG__ #endif // __WXDEBUG__
@@ -80,7 +80,7 @@ public:
// This returns the current visual: either that used by wxRootWindow // This returns the current visual: either that used by wxRootWindow
// or the XVisualInfo* for SGI. // or the XVisualInfo* for SGI.
GdkVisual *GetGdkVisual(); GdkVisual *GetGdkVisual();
private: private:
// true if we're inside an assert modal dialog // true if we're inside an assert modal dialog
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@@ -88,7 +88,7 @@ private:
#endif // __WXDEBUG__ #endif // __WXDEBUG__
bool CallInternalIdle( wxWindow* win ); bool CallInternalIdle( wxWindow* win );
DECLARE_DYNAMIC_CLASS(wxApp) DECLARE_DYNAMIC_CLASS(wxApp)
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };

32
src/gtk/app.cpp
View File

@@ -132,7 +132,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
// It's necessary to call ProcessIdle() to update the frames sizes which // It's necessary to call ProcessIdle() to update the frames sizes which
// might have been changed (it also will update other things set from // might have been changed (it also will update other things set from
// OnUpdateUI() which is a nice (and desired) side effect). But we // OnUpdateUI() which is a nice (and desired) side effect). But we
// call ProcessIdle() only once since this is not meant for longish // call ProcessIdle() only once since this is not meant for longish
// background jobs (controlled by wxIdleEvent::RequestMore() and the // background jobs (controlled by wxIdleEvent::RequestMore() and the
// return value of Processidle(). // return value of Processidle().
@@ -326,7 +326,7 @@ wxApp::wxApp()
#endif #endif
m_colorCube = (unsigned char*) NULL; m_colorCube = (unsigned char*) NULL;
// this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
m_glVisualInfo = (void *) NULL; m_glVisualInfo = (void *) NULL;
} }
@@ -353,7 +353,7 @@ bool wxApp::OnInitGui()
// seems gtk_widget_set_default_visual no longer exists? // seems gtk_widget_set_default_visual no longer exists?
GdkVisual* vis = gtk_widget_get_default_visual(); GdkVisual* vis = gtk_widget_get_default_visual();
#else #else
GdkVisual* vis = gdkx_visual_get( GdkVisual* vis = gdkx_visual_get(
((XVisualInfo *) m_glVisualInfo) ->visualid ); ((XVisualInfo *) m_glVisualInfo) ->visualid );
gtk_widget_set_default_visual( vis ); gtk_widget_set_default_visual( vis );
#endif #endif
@@ -363,7 +363,7 @@ bool wxApp::OnInitGui()
visual = vis; visual = vis;
} }
// On some machines, the default visual is just 256 colours, so // On some machines, the default visual is just 256 colours, so
// we make sure we get the best. This can sometimes be wasteful. // we make sure we get the best. This can sometimes be wasteful.
@@ -441,14 +441,14 @@ bool wxApp::OnInitGui()
GdkVisual *wxApp::GetGdkVisual() GdkVisual *wxApp::GetGdkVisual()
{ {
GdkVisual *visual = NULL; GdkVisual *visual = NULL;
if (m_glVisualInfo) if (m_glVisualInfo)
visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
else else
visual = gdk_window_get_visual( wxGetRootWindow()->window ); visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual ); wxASSERT( visual );
return visual; return visual;
} }
@@ -497,7 +497,7 @@ bool wxApp::SendIdleEvents()
wxWindow* win = node->GetData(); wxWindow* win = node->GetData();
if (SendIdleEvents(win)) if (SendIdleEvents(win))
needMore = TRUE; needMore = TRUE;
node = node->GetNext(); node = node->GetNext();
} }
@@ -506,7 +506,7 @@ bool wxApp::SendIdleEvents()
{ {
wxWindow* win = node->GetData(); wxWindow* win = node->GetData();
CallInternalIdle( win ); CallInternalIdle( win );
node = node->GetNext(); node = node->GetNext();
} }
return needMore; return needMore;
@@ -524,7 +524,7 @@ bool wxApp::CallInternalIdle( wxWindow* win )
node = node->Next(); node = node->Next();
} }
return TRUE; return TRUE;
} }
@@ -549,7 +549,7 @@ bool wxApp::SendIdleEvents( wxWindow* win )
node = node->Next(); node = node->Next();
} }
return needMore; return needMore;
} }
@@ -829,11 +829,11 @@ int wxEntry( int argc, char *argv[] )
wxTheApp->OnRun(); wxTheApp->OnRun();
wxWindow *topWindow = wxTheApp->GetTopWindow(); wxWindow *topWindow = wxTheApp->GetTopWindow();
// Delete all pending windows if any // Delete all pending windows if any
wxTheApp->DeletePendingObjects(); wxTheApp->DeletePendingObjects();
// Reset top window // Reset top window
if (topWindow) if (topWindow)
wxTheApp->SetTopWindow( (wxWindow*) NULL ); wxTheApp->SetTopWindow( (wxWindow*) NULL );
@@ -848,11 +848,11 @@ int wxEntry( int argc, char *argv[] )
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
{ {
m_isInAssert = TRUE; m_isInAssert = TRUE;
wxAppBase::OnAssert(file, line, msg); wxAppBase::OnAssert(file, line, cond, msg);
m_isInAssert = FALSE; m_isInAssert = FALSE;
} }

32
src/gtk1/app.cpp
View File

@@ -132,7 +132,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
// It's necessary to call ProcessIdle() to update the frames sizes which // It's necessary to call ProcessIdle() to update the frames sizes which
// might have been changed (it also will update other things set from // might have been changed (it also will update other things set from
// OnUpdateUI() which is a nice (and desired) side effect). But we // OnUpdateUI() which is a nice (and desired) side effect). But we
// call ProcessIdle() only once since this is not meant for longish // call ProcessIdle() only once since this is not meant for longish
// background jobs (controlled by wxIdleEvent::RequestMore() and the // background jobs (controlled by wxIdleEvent::RequestMore() and the
// return value of Processidle(). // return value of Processidle().
@@ -326,7 +326,7 @@ wxApp::wxApp()
#endif #endif
m_colorCube = (unsigned char*) NULL; m_colorCube = (unsigned char*) NULL;
// this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
m_glVisualInfo = (void *) NULL; m_glVisualInfo = (void *) NULL;
} }
@@ -353,7 +353,7 @@ bool wxApp::OnInitGui()
// seems gtk_widget_set_default_visual no longer exists? // seems gtk_widget_set_default_visual no longer exists?
GdkVisual* vis = gtk_widget_get_default_visual(); GdkVisual* vis = gtk_widget_get_default_visual();
#else #else
GdkVisual* vis = gdkx_visual_get( GdkVisual* vis = gdkx_visual_get(
((XVisualInfo *) m_glVisualInfo) ->visualid ); ((XVisualInfo *) m_glVisualInfo) ->visualid );
gtk_widget_set_default_visual( vis ); gtk_widget_set_default_visual( vis );
#endif #endif
@@ -363,7 +363,7 @@ bool wxApp::OnInitGui()
visual = vis; visual = vis;
} }
// On some machines, the default visual is just 256 colours, so // On some machines, the default visual is just 256 colours, so
// we make sure we get the best. This can sometimes be wasteful. // we make sure we get the best. This can sometimes be wasteful.
@@ -441,14 +441,14 @@ bool wxApp::OnInitGui()
GdkVisual *wxApp::GetGdkVisual() GdkVisual *wxApp::GetGdkVisual()
{ {
GdkVisual *visual = NULL; GdkVisual *visual = NULL;
if (m_glVisualInfo) if (m_glVisualInfo)
visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid ); visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
else else
visual = gdk_window_get_visual( wxGetRootWindow()->window ); visual = gdk_window_get_visual( wxGetRootWindow()->window );
wxASSERT( visual ); wxASSERT( visual );
return visual; return visual;
} }
@@ -497,7 +497,7 @@ bool wxApp::SendIdleEvents()
wxWindow* win = node->GetData(); wxWindow* win = node->GetData();
if (SendIdleEvents(win)) if (SendIdleEvents(win))
needMore = TRUE; needMore = TRUE;
node = node->GetNext(); node = node->GetNext();
} }
@@ -506,7 +506,7 @@ bool wxApp::SendIdleEvents()
{ {
wxWindow* win = node->GetData(); wxWindow* win = node->GetData();
CallInternalIdle( win ); CallInternalIdle( win );
node = node->GetNext(); node = node->GetNext();
} }
return needMore; return needMore;
@@ -524,7 +524,7 @@ bool wxApp::CallInternalIdle( wxWindow* win )
node = node->Next(); node = node->Next();
} }
return TRUE; return TRUE;
} }
@@ -549,7 +549,7 @@ bool wxApp::SendIdleEvents( wxWindow* win )
node = node->Next(); node = node->Next();
} }
return needMore; return needMore;
} }
@@ -829,11 +829,11 @@ int wxEntry( int argc, char *argv[] )
wxTheApp->OnRun(); wxTheApp->OnRun();
wxWindow *topWindow = wxTheApp->GetTopWindow(); wxWindow *topWindow = wxTheApp->GetTopWindow();
// Delete all pending windows if any // Delete all pending windows if any
wxTheApp->DeletePendingObjects(); wxTheApp->DeletePendingObjects();
// Reset top window // Reset top window
if (topWindow) if (topWindow)
wxTheApp->SetTopWindow( (wxWindow*) NULL ); wxTheApp->SetTopWindow( (wxWindow*) NULL );
@@ -848,11 +848,11 @@ int wxEntry( int argc, char *argv[] )
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg) void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
{ {
m_isInAssert = TRUE; m_isInAssert = TRUE;
wxAppBase::OnAssert(file, line, msg); wxAppBase::OnAssert(file, line, cond, msg);
m_isInAssert = FALSE; m_isInAssert = FALSE;
} }