From e7c80f9e052d3d50b3d7780b21e55d8c5586cdea Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 24 May 2006 15:13:23 +0000 Subject: [PATCH] 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 --- src/common/dobjcmn.cpp | 5 ++--- src/common/imagbmp.cpp | 1 - src/common/image.cpp | 1 - src/common/imagjpeg.cpp | 1 - src/common/imagpng.cpp | 1 - src/common/imagtiff.cpp | 2 +- src/common/init.cpp | 2 -- src/common/intl.cpp | 1 - src/generic/filedlgg.cpp | 7 +++---- src/gtk/dataobj.cpp | 1 - src/gtk/fontdlg.cpp | 1 - src/gtk/settings.cpp | 14 +++++++------- src/gtk1/dataobj.cpp | 1 - src/gtk1/fontdlg.cpp | 1 - src/gtk1/settings.cpp | 14 +++++++------- 15 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index e9aa506b79..1dbe454bc0 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -18,13 +18,12 @@ #if wxUSE_DATAOBJ +#include "wx/dataobj.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/debug.h" #endif -#include "wx/dataobj.h" - // ---------------------------------------------------------------------------- // lists // ---------------------------------------------------------------------------- diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp index 02d6d6ecca..77d8d7b63f 100644 --- a/src/common/imagbmp.cpp +++ b/src/common/imagbmp.cpp @@ -23,7 +23,6 @@ #include "wx/imagbmp.h" #include "wx/bitmap.h" -#include "wx/debug.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 64f367c521..9e53e054f5 100644 --- a/src/common/image.cpp +++ b/src/common/image.cpp @@ -25,7 +25,6 @@ #include "wx/image.h" #include "wx/bitmap.h" -#include "wx/debug.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 790dc68121..829dc4c796 100644 --- a/src/common/imagjpeg.cpp +++ b/src/common/imagjpeg.cpp @@ -25,7 +25,6 @@ #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). diff --git a/src/common/imagpng.cpp b/src/common/imagpng.cpp index 5a5b25e584..07f0c8ad54 100644 --- a/src/common/imagpng.cpp +++ b/src/common/imagpng.cpp @@ -31,7 +31,6 @@ #include "wx/imagpng.h" #include "wx/bitmap.h" -#include "wx/debug.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 7662ccf86c..1b108699a8 100644 --- a/src/common/imagtiff.cpp +++ b/src/common/imagtiff.cpp @@ -25,7 +25,7 @@ #endif #include "wx/bitmap.h" -#include "wx/debug.h" + extern "C" { #include "tiff.h" diff --git a/src/common/init.cpp b/src/common/init.cpp index bed80097dd..697aea6656 100644 --- a/src/common/init.cpp +++ b/src/common/init.cpp @@ -25,7 +25,6 @@ #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/debug.h" #include "wx/filefn.h" #include "wx/log.h" #include "wx/thread.h" @@ -481,4 +480,3 @@ void wxUninitialize() wxEntryCleanup(); } } - diff --git a/src/common/intl.cpp b/src/common/intl.cpp index d61d890e41..0f3e9b0572 100644 --- 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/debug.h" #include "wx/utils.h" #include "wx/app.h" #endif // WX_PRECOMP diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 4c7f965cd9..31790cceb8 100644 --- 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/log.h" #endif #include "wx/checkbox.h" @@ -34,8 +35,6 @@ #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" @@ -56,8 +55,8 @@ #endif #ifndef __WXWINCE__ -#include -#include + #include + #include #endif #ifdef __UNIX__ diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index c9e08da558..8ed8108997 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -19,7 +19,6 @@ #include "wx/app.h" #endif -#include "wx/debug.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 47efa1cfc6..66b985019f 100644 --- a/src/gtk/fontdlg.cpp +++ b/src/gtk/fontdlg.cpp @@ -20,7 +20,6 @@ #endif #include "wx/fontutil.h" -#include "wx/debug.h" #include "wx/msgdlg.h" #include "wx/gtk/private.h" diff --git a/src/gtk/settings.cpp b/src/gtk/settings.cpp index a7ed537f03..b0cb27143e 100644 --- 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) @@ -12,7 +12,7 @@ #include "wx/wxprec.h" #include "wx/settings.h" -#include "wx/debug.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; - ok = TRUE; + ok = true; } else { - ok = FALSE; + ok = false; } gtk_widget_destroy( widget ); @@ -642,12 +642,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) switch (index) { case wxSYS_CAN_ICONIZE_FRAME: - return FALSE; + return false; case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; + return true; default: - return FALSE; + return false; } } diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp index 0ac72c51b0..fc029b8565 100644 --- a/src/gtk1/dataobj.cpp +++ b/src/gtk1/dataobj.cpp @@ -19,7 +19,6 @@ #include "wx/app.h" #endif -#include "wx/debug.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 741824b351..1c39ba5d23 100644 --- a/src/gtk1/fontdlg.cpp +++ b/src/gtk1/fontdlg.cpp @@ -20,7 +20,6 @@ #endif #include "wx/fontutil.h" -#include "wx/debug.h" #include "wx/msgdlg.h" #include "wx/gtk1/private.h" diff --git a/src/gtk1/settings.cpp b/src/gtk1/settings.cpp index 7eb099a0af..5943aa5b0a 100644 --- 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) @@ -12,7 +12,7 @@ #include "wx/wxprec.h" #include "wx/settings.h" -#include "wx/debug.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; - ok = TRUE; + ok = true; } else { - ok = FALSE; + ok = false; } gtk_widget_destroy( widget ); @@ -465,12 +465,12 @@ bool wxSystemSettingsNative::HasFeature(wxSystemFeature index) switch (index) { case wxSYS_CAN_ICONIZE_FRAME: - return FALSE; + return false; case wxSYS_CAN_DRAW_FRAME_DECORATIONS: - return TRUE; + return true; default: - return FALSE; + return false; } } -- 2.45.2