fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

[wxWidgets.git] / include / wx / debug.h

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 7529d847c4f68bc3211bf631ac38987a0331e326..f1a4d9b4e86975a6f72b0cda86d136d9463b19cf 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -11,7 +11,7 @@
 #ifndef _WX_DEBUG_H_
 #define _WX_DEBUG_H_
 
 #ifndef _WX_DEBUG_H_
 #define _WX_DEBUG_H_
 

-#if !defined(__WXPALMOS5__) && !defined(__WXWINCE__)
+#if !defined(__WXWINCE__)

     #include  <assert.h>
 #endif // systems without assert.h
 
     #include  <assert.h>
 #endif // systems without assert.h
 


@@ -178,28 +178,28 @@ inline void wxDisableAsserts() { wxSetAssertHandler(NULL); }
 //
 // also notice that these functions can't be inline as wxString is not defined
 // yet (and can't be as wxString code itself may use assertions)
 //
 // also notice that these functions can't be inline as wxString is not defined
 // yet (and can't be as wxString code itself may use assertions)

-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,

                                         int line,
                                         const char *func,
                                         const char *cond);
 
                                         int line,
                                         const char *func,
                                         const char *cond);
 

-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,

                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const char *msg);
 
                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const char *msg);
 

-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,

                                         int line,
                                         const char *func,
                                         const char *cond,
                                         int line,
                                         const char *func,
                                         const char *cond,

-                                        const wxChar *msg);
+                                        const wxChar *msg) ;

 #endif /* wxUSE_UNICODE */
 
 // this version is for compatibility with wx 2.8 Unicode build only, we don't
 // use it ourselves any more except in ANSI-only build in which case it is all
 // we need
 #endif /* wxUSE_UNICODE */
 
 // this version is for compatibility with wx 2.8 Unicode build only, we don't
 // use it ourselves any more except in ANSI-only build in which case it is all
 // we need

-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxChar *file,

                                         int line,
                                         const char *func,
                                         const wxChar *cond,
                                         int line,
                                         const char *func,
                                         const wxChar *cond,


@@ -208,24 +208,24 @@ extern void WXDLLIMPEXP_BASE wxOnAssert(const wxChar *file,
 // these overloads work when msg passed to debug macro is a string and we
 // also have to provide wxCStrData overload to resolve ambiguity which would
 // otherwise arise from wxASSERT( s.c_str() )
 // these overloads work when msg passed to debug macro is a string and we
 // also have to provide wxCStrData overload to resolve ambiguity which would
 // otherwise arise from wxASSERT( s.c_str() )

-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,

                                         int line,
                                         const wxString& func,
                                         const wxString& cond,
                                         const wxString& msg);
 
                                         int line,
                                         const wxString& func,
                                         const wxString& cond,
                                         const wxString& msg);
 

-extern void WXDLLIMPEXP_BASE wxOnAssert(const wxString& file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const wxString& file,

                                         int line,
                                         const wxString& func,
                                         const wxString& cond);
 
                                         int line,
                                         const wxString& func,
                                         const wxString& cond);
 

-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,

                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const wxCStrData& msg);
 
                                         int line,
                                         const char *func,
                                         const char *cond,
                                         const wxCStrData& msg);
 

-extern void WXDLLIMPEXP_BASE wxOnAssert(const char *file,
+extern WXDLLIMPEXP_BASE void wxOnAssert(const char *file,

                                         int line,
                                         const char *func,
                                         const char *cond,
                                         int line,
                                         const char *func,
                                         const char *cond,


@@ -437,10 +437,9 @@ template<int x> struct static_assert_test{};
 /*
     Return true if we're running under debugger.
 
 /*
     Return true if we're running under debugger.
 

-    Currently this only really works under Win32 and Mac in CodeWarrior builds,
-    it always returns false in other cases.
+    Currently only really works under Win32 and just returns false elsewhere.

  */
  */

-#if defined(__WXMAC__) || defined(__WIN32__)
+#if defined(__WIN32__)

     extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
 #else // !Mac
     inline bool wxIsDebuggerRunning() { return false; }
     extern bool WXDLLIMPEXP_BASE wxIsDebuggerRunning();
 #else // !Mac
     inline bool wxIsDebuggerRunning() { return false; }