wx/debug.h is always unconditionally included by wx/defs.h

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index e9aa506b79b082d59e32a72fbfc6d248ec7e2a1d..1dbe454bc0f126bf38b716475fdbed8cd23bf362 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -18,13 +18,12 @@
 
 #if wxUSE_DATAOBJ
 
 
 #if wxUSE_DATAOBJ
 

+#include "wx/dataobj.h"
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/debug.h"

 #endif
 
 #endif
 

-#include "wx/dataobj.h"
-

 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // lists
 // ----------------------------------------------------------------------------

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 02d6d6ecca3dc011a407c70613b270d12b408af0..77d8d7b63f115305ca81fd0e130806e51a948bfd 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -23,7 +23,6 @@
 
 #include "wx/imagbmp.h"
 #include "wx/bitmap.h"
 
 #include "wx/imagbmp.h"
 #include "wx/bitmap.h"

-#include "wx/debug.h"

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 64f367c5216066cc9f3e6f1aa1420ce3c272b905..9e53e054f5ffe62aefd63c3d5551019242ab50ac 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -25,7 +25,6 @@
 
 #include "wx/image.h"
 #include "wx/bitmap.h"
 
 #include "wx/image.h"
 #include "wx/bitmap.h"

-#include "wx/debug.h"

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/intl.h"

diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 790dc681212cb289a340f95702d984bdcb221f67..829dc4c796ec09fdc455ce1e5f197b2ea6924554 100644 (file)
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -25,7 +25,6 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

-#include "wx/debug.h"

 
 // NB: Some compilers define boolean type in Windows headers
 //     (e.g. Watcom C++, but not Open Watcom).
 
 // NB: Some compilers define boolean type in Windows headers
 //     (e.g. Watcom C++, but not Open Watcom).

diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp
index 5a5b25e584172451724ba5dc4cdd9797109ab794..07f0c8ad544162471b8a5a02917e9879cac30072 100644 (file)
--- a/src/common/imagpng.cpp
+++ b/src/common/imagpng.cpp
@@ -31,7 +31,6 @@
 
 #include "wx/imagpng.h"
 #include "wx/bitmap.h"
 
 #include "wx/imagpng.h"
 #include "wx/bitmap.h"

-#include "wx/debug.h"

 #include "png.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "png.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

diff --git a/src/common/imagtiff.cpp b/src/common/imagtiff.cpp
index 7662ccf86c9e1afc38e606cc6e6e8aa88d834af0..1b108699a8a6d61f0c37644a1b54f41df19a65fa 100644 (file)
--- a/src/common/imagtiff.cpp
+++ b/src/common/imagtiff.cpp
@@ -25,7 +25,7 @@
 #endif
 
 #include "wx/bitmap.h"
 #endif
 
 #include "wx/bitmap.h"

-#include "wx/debug.h"
+

 extern "C"
 {
     #include "tiff.h"
 extern "C"
 {
     #include "tiff.h"

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bed80097ddb95a383093fc59e483870d12a4cedc..697aea665658ad9f2097b6a9791beb56e6185873 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -25,7 +25,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

-    #include "wx/debug.h"

     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/thread.h"
     #include "wx/filefn.h"
     #include "wx/log.h"
     #include "wx/thread.h"


@@ -481,4 +480,3 @@ void wxUninitialize()
         wxEntryCleanup();
     }
 }
         wxEntryCleanup();
     }
 }

-

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index d61d890e41bc589cd261fde050c0df4220b79971..0f3e9b0572410d445024bcc7340b9b6f91b33f07 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -44,7 +44,6 @@
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/string.h"
     #include "wx/intl.h"
     #include "wx/log.h"

-    #include "wx/debug.h"

     #include "wx/utils.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
 #endif // WX_PRECOMP

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 4c7f965cd924fcb6e99b986828cc866f8411a54d..31790cceb82086b4490d35f85dac2b60f80f4386 100644 (file)
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -27,6 +27,7 @@
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/settings.h"
     #include "wx/hash.h"
     #include "wx/intl.h"
     #include "wx/settings.h"

+    #include "wx/log.h"

 #endif
 
 #include "wx/checkbox.h"
 #endif
 
 #include "wx/checkbox.h"


@@ -34,8 +35,6 @@
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"

-#include "wx/debug.h"
-#include "wx/log.h"

 #include "wx/longlong.h"
 #include "wx/msgdlg.h"
 #include "wx/sizer.h"
 #include "wx/longlong.h"
 #include "wx/msgdlg.h"
 #include "wx/sizer.h"


@@ -56,8 +55,8 @@
 #endif
 
 #ifndef __WXWINCE__
 #endif
 
 #ifndef __WXWINCE__

-#include <sys/types.h>
-#include <sys/stat.h>
+    #include <sys/types.h>
+    #include <sys/stat.h>

 #endif
 
 #ifdef __UNIX__
 #endif
 
 #ifdef __UNIX__

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index c9e08da558ff2f556bea9f7c5b8daefe0288cb8b..8ed810899780af1660a6f7c78420cedaf4dfe5fc 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -19,7 +19,6 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#include "wx/debug.h"

 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/uri.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/uri.h"

diff --git a/src/gtk/fontdlg.cpp b/src/gtk/fontdlg.cpp
index 47efa1cfc61210e806be0c51b8b069b03ab4c92d..66b985019f14f763ada500d7e3ac624b1aedb746 100644 (file)
--- a/src/gtk/fontdlg.cpp
+++ b/src/gtk/fontdlg.cpp
@@ -20,7 +20,6 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/debug.h"

 #include "wx/msgdlg.h"
 
 #include "wx/gtk/private.h"
 #include "wx/msgdlg.h"
 
 #include "wx/gtk/private.h"

diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp
index a7ed537f030b293c8d342637c8b7e17f4e73aed9..b0cb27143e26f0b2bdb25fec93fb8e97156b81e4 100644 (file)
--- a/src/gtk/settings.cpp
+++ b/src/gtk/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/settings.cpp
+// Name:        src/gtk/settings.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)


@@ -12,7 +12,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"

-#include "wx/debug.h"
+

 #include "wx/cmndata.h"
 #include "wx/fontutil.h"
 #include "wx/toplevel.h"
 #include "wx/cmndata.h"
 #include "wx/fontutil.h"
 #include "wx/toplevel.h"


@@ -131,11 +131,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         green = col[state].green;
         blue = col[state].blue;
 
         green = col[state].green;
         blue = col[state].blue;
 

-        ok = TRUE;
+        ok = true;

     }
     else
     {
     }
     else
     {

-        ok = FALSE;
+        ok = false;

     }
 
     gtk_widget_destroy( widget );
     }
 
     gtk_widget_destroy( widget );


@@ -642,12 +642,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:

-            return FALSE;
+            return false;

 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index 0ac72c51b012578f8a36ef45e97081e8356f3074..fc029b856552cd6872003222d5c5133f89620de8 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -19,7 +19,6 @@
     #include "wx/app.h"
 #endif
 
     #include "wx/app.h"
 #endif
 

-#include "wx/debug.h"

 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/uri.h"
 #include "wx/mstream.h"
 #include "wx/image.h"
 #include "wx/uri.h"

diff --git a/src/gtk1/fontdlg.cpp b/src/gtk1/fontdlg.cpp
index 741824b3515197b9c4165835227cdd89a28d6e26..1c39ba5d23243ffc163e7c9d01c97ab1efc78f8b 100644 (file)
--- a/src/gtk1/fontdlg.cpp
+++ b/src/gtk1/fontdlg.cpp
@@ -20,7 +20,6 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

-#include "wx/debug.h"

 #include "wx/msgdlg.h"
 
 #include "wx/gtk1/private.h"
 #include "wx/msgdlg.h"
 
 #include "wx/gtk1/private.h"

diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp
index 7eb099a0af6365dbd2afccac18ae0fc5c668a875..5943aa5b0a45c345a89a8ea093990c43b6644b4f 100644 (file)
--- a/src/gtk1/settings.cpp
+++ b/src/gtk1/settings.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/settings.cpp
+// Name:        src/gtk1/settings.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)
 // Purpose:
 // Author:      Robert Roebling
 // Modified by: Mart Raudsepp (GetMetric)


@@ -12,7 +12,7 @@
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"
 #include "wx/wxprec.h"
 
 #include "wx/settings.h"

-#include "wx/debug.h"
+

 #include "wx/cmndata.h"
 #include "wx/fontutil.h"
 #include "wx/toplevel.h"
 #include "wx/cmndata.h"
 #include "wx/fontutil.h"
 #include "wx/toplevel.h"


@@ -125,11 +125,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
         green = col[state].green;
         blue = col[state].blue;
 
         green = col[state].green;
         blue = col[state].blue;
 

-        ok = TRUE;
+        ok = true;

     }
     else
     {
     }
     else
     {

-        ok = FALSE;
+        ok = false;

     }
 
     gtk_widget_destroy( widget );
     }
 
     gtk_widget_destroy( widget );


@@ -465,12 +465,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index)
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:
     switch (index)
     {
         case wxSYS_CAN_ICONIZE_FRAME:

-            return FALSE;
+            return false;

 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:
 
         case wxSYS_CAN_DRAW_FRAME_DECORATIONS:

-            return TRUE;
+            return true;

 
         default:
 
         default:

-            return FALSE;
+            return false;

     }
 }
     }
 }