Fixed wxApp::OnAssert signature.

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index d10118ecf3199fa8b099c05e04955c62b604c8a7..cdb4c4cb73ed8e229ccdfc52a1f9ae833c16a6b4 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -61,7 +61,7 @@ public:
     void DeletePendingObjects();
 
 #ifdef __WXDEBUG__
     void DeletePendingObjects();
 
 #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; }
 #endif // __WXDEBUG__
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__


@@ -80,7 +80,7 @@ public:
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();

-    
+

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__


@@ -88,7 +88,7 @@ private:
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );

-    
+

     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index d10118ecf3199fa8b099c05e04955c62b604c8a7..cdb4c4cb73ed8e229ccdfc52a1f9ae833c16a6b4 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -61,7 +61,7 @@ public:
     void DeletePendingObjects();
 
 #ifdef __WXDEBUG__
     void DeletePendingObjects();
 
 #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; }
 #endif // __WXDEBUG__
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__


@@ -80,7 +80,7 @@ public:
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();
     // This returns the current visual: either that used by wxRootWindow
     // or the XVisualInfo* for SGI.
     GdkVisual      *GetGdkVisual();

-    
+

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__


@@ -88,7 +88,7 @@ private:
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );
 #endif // __WXDEBUG__
 
     bool CallInternalIdle( wxWindow* win );

-    
+

     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 };

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 3f05639ce8b0e684d142e82b8fda3856af3861b5..b5045c14bb29d3d53993d86e782feddf8e17a27d 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -132,7 +132,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // 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
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().
     // call ProcessIdle() only once since this is not meant for longish
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().


@@ -326,7 +326,7 @@ wxApp::wxApp()
 #endif
 
     m_colorCube = (unsigned char*) NULL;
 #endif
 
     m_colorCube = (unsigned char*) NULL;

-    
+

     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }


@@ -353,7 +353,7 @@ bool wxApp::OnInitGui()
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else

-        GdkVisual* vis = gdkx_visual_get( 
+        GdkVisual* vis = gdkx_visual_get(

             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif


@@ -363,7 +363,7 @@ bool wxApp::OnInitGui()
 
         visual = vis;
     }
 
         visual = vis;
     }

-    
+

     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 
     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 


@@ -441,14 +441,14 @@ bool wxApp::OnInitGui()
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;

-    
+

     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         visual = gdk_window_get_visual( wxGetRootWindow()->window );
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         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();
         if (SendIdleEvents(win))
             needMore = TRUE;
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;

-            
+

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 


@@ -506,7 +506,7 @@ bool wxApp::SendIdleEvents()
     {
         wxWindow* win = node->GetData();
         CallInternalIdle( win );
     {
         wxWindow* win = node->GetData();
         CallInternalIdle( win );

-        
+

         node = node->GetNext();
     }
     return needMore;
         node = node->GetNext();
     }
     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();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();
             wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();

-            
+

             // Delete all pending windows if any
             wxTheApp->DeletePendingObjects();
             // Delete all pending windows if any
             wxTheApp->DeletePendingObjects();

-    
-            // Reset top window 
+
+            // Reset top window

             if (topWindow)
                 wxTheApp->SetTopWindow( (wxWindow*) NULL );
 
             if (topWindow)
                 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;
 }

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 3f05639ce8b0e684d142e82b8fda3856af3861b5..b5045c14bb29d3d53993d86e782feddf8e17a27d 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -132,7 +132,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from
 
     // It's necessary to call ProcessIdle() to update the frames sizes which
     // 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
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().
     // call ProcessIdle() only once since this is not meant for longish
     // background jobs (controlled by wxIdleEvent::RequestMore() and the
     // return value of Processidle().


@@ -326,7 +326,7 @@ wxApp::wxApp()
 #endif
 
     m_colorCube = (unsigned char*) NULL;
 #endif
 
     m_colorCube = (unsigned char*) NULL;

-    
+

     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
     m_glVisualInfo = (void *) NULL;
 }


@@ -353,7 +353,7 @@ bool wxApp::OnInitGui()
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else
         // seems gtk_widget_set_default_visual no longer exists?
         GdkVisual* vis = gtk_widget_get_default_visual();
 #else

-        GdkVisual* vis = gdkx_visual_get( 
+        GdkVisual* vis = gdkx_visual_get(

             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif
             ((XVisualInfo *) m_glVisualInfo) ->visualid );
         gtk_widget_set_default_visual( vis );
 #endif


@@ -363,7 +363,7 @@ bool wxApp::OnInitGui()
 
         visual = vis;
     }
 
         visual = vis;
     }

-    
+

     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 
     // On some machines, the default visual is just 256 colours, so
     // we make sure we get the best. This can sometimes be wasteful.
 


@@ -441,14 +441,14 @@ bool wxApp::OnInitGui()
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;
 GdkVisual *wxApp::GetGdkVisual()
 {
     GdkVisual *visual = NULL;

-    
+

     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         visual = gdk_window_get_visual( wxGetRootWindow()->window );
     if (m_glVisualInfo)
         visual = gdkx_visual_get( ((XVisualInfo *) m_glVisualInfo)->visualid );
     else
         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();
         if (SendIdleEvents(win))
             needMore = TRUE;
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win))
             needMore = TRUE;

-            
+

         node = node->GetNext();
     }
 
         node = node->GetNext();
     }
 


@@ -506,7 +506,7 @@ bool wxApp::SendIdleEvents()
     {
         wxWindow* win = node->GetData();
         CallInternalIdle( win );
     {
         wxWindow* win = node->GetData();
         CallInternalIdle( win );

-        
+

         node = node->GetNext();
     }
     return needMore;
         node = node->GetNext();
     }
     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();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();
             wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();

-            
+

             // Delete all pending windows if any
             wxTheApp->DeletePendingObjects();
             // Delete all pending windows if any
             wxTheApp->DeletePendingObjects();

-    
-            // Reset top window 
+
+            // Reset top window

             if (topWindow)
                 wxTheApp->SetTopWindow( (wxWindow*) NULL );
 
             if (topWindow)
                 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;
 }