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
This commit is contained in:
Włodzimierz Skiba
2006-05-24 15:13:23 +00:00
parent 32816f9a68
commit e7c80f9e05
15 changed files with 20 additions and 33 deletions

View File

@@ -18,13 +18,12 @@
#if wxUSE_DATAOBJ #if wxUSE_DATAOBJ
#include "wx/dataobj.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/debug.h"
#endif #endif
#include "wx/dataobj.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// lists // lists
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -23,7 +23,6 @@
#include "wx/imagbmp.h" #include "wx/imagbmp.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/debug.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/intl.h" #include "wx/intl.h"

View File

@@ -25,7 +25,6 @@
#include "wx/image.h" #include "wx/image.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/debug.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"
#include "wx/intl.h" #include "wx/intl.h"

View File

@@ -25,7 +25,6 @@
#endif #endif
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/debug.h"
// NB: Some compilers define boolean type in Windows headers // NB: Some compilers define boolean type in Windows headers
// (e.g. Watcom C++, but not Open Watcom). // (e.g. Watcom C++, but not Open Watcom).

View File

@@ -31,7 +31,6 @@
#include "wx/imagpng.h" #include "wx/imagpng.h"
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/debug.h"
#include "png.h" #include "png.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/wfstream.h" #include "wx/wfstream.h"

View File

@@ -25,7 +25,7 @@
#endif #endif
#include "wx/bitmap.h" #include "wx/bitmap.h"
#include "wx/debug.h"
extern "C" extern "C"
{ {
#include "tiff.h" #include "tiff.h"

View File

@@ -25,7 +25,6 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/debug.h"
#include "wx/filefn.h" #include "wx/filefn.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/thread.h" #include "wx/thread.h"
@@ -481,4 +480,3 @@ void wxUninitialize()
wxEntryCleanup(); wxEntryCleanup();
} }
} }

View File

@@ -44,7 +44,6 @@
#include "wx/string.h" #include "wx/string.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/debug.h"
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP

View File

@@ -27,6 +27,7 @@
#include "wx/hash.h" #include "wx/hash.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/log.h"
#endif #endif
#include "wx/checkbox.h" #include "wx/checkbox.h"
@@ -34,8 +35,6 @@
#include "wx/choice.h" #include "wx/choice.h"
#include "wx/checkbox.h" #include "wx/checkbox.h"
#include "wx/stattext.h" #include "wx/stattext.h"
#include "wx/debug.h"
#include "wx/log.h"
#include "wx/longlong.h" #include "wx/longlong.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/sizer.h" #include "wx/sizer.h"
@@ -56,8 +55,8 @@
#endif #endif
#ifndef __WXWINCE__ #ifndef __WXWINCE__
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#ifdef __UNIX__ #ifdef __UNIX__

View File

@@ -19,7 +19,6 @@
#include "wx/app.h" #include "wx/app.h"
#endif #endif
#include "wx/debug.h"
#include "wx/mstream.h" #include "wx/mstream.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/uri.h" #include "wx/uri.h"

View File

@@ -20,7 +20,6 @@
#endif #endif
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/debug.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/gtk/private.h" #include "wx/gtk/private.h"

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gtk/settings.cpp // Name: src/gtk/settings.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Modified by: Mart Raudsepp (GetMetric) // Modified by: Mart Raudsepp (GetMetric)
@@ -12,7 +12,7 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/debug.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
@@ -131,11 +131,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
green = col[state].green; green = col[state].green;
blue = col[state].blue; 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) switch (index)
{ {
case wxSYS_CAN_ICONIZE_FRAME: 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;
} }
} }

View File

@@ -19,7 +19,6 @@
#include "wx/app.h" #include "wx/app.h"
#endif #endif
#include "wx/debug.h"
#include "wx/mstream.h" #include "wx/mstream.h"
#include "wx/image.h" #include "wx/image.h"
#include "wx/uri.h" #include "wx/uri.h"

View File

@@ -20,7 +20,6 @@
#endif #endif
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/debug.h"
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#include "wx/gtk1/private.h" #include "wx/gtk1/private.h"

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: gtk/settings.cpp // Name: src/gtk1/settings.cpp
// Purpose: // Purpose:
// Author: Robert Roebling // Author: Robert Roebling
// Modified by: Mart Raudsepp (GetMetric) // Modified by: Mart Raudsepp (GetMetric)
@@ -12,7 +12,7 @@
#include "wx/wxprec.h" #include "wx/wxprec.h"
#include "wx/settings.h" #include "wx/settings.h"
#include "wx/debug.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"
#include "wx/fontutil.h" #include "wx/fontutil.h"
#include "wx/toplevel.h" #include "wx/toplevel.h"
@@ -125,11 +125,11 @@ static bool GetColourFromGTKWidget(int& red, int& green, int& blue,
green = col[state].green; green = col[state].green;
blue = col[state].blue; 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) switch (index)
{ {
case wxSYS_CAN_ICONIZE_FRAME: 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;
} }
} }