Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 17:20:50 +00:00
parent 8498a2858b
commit b73e73f912
23 changed files with 132 additions and 133 deletions

View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLGH_G__ #ifndef __COLORDLGH_G__
#define __COLORDLGH_G__ #define __COLORDLGH_G__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -12,7 +12,7 @@
#ifndef _WX_GENERIC_FONTDLGG_H #ifndef _WX_GENERIC_FONTDLGG_H
#define _WX_GENERIC_FONTDLGG_H #define _WX_GENERIC_FONTDLGG_H
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/font.h" #include "wx/font.h"
#include "wx/dialog.h" #include "wx/dialog.h"
@@ -90,4 +90,3 @@ WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight);
WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style); WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style);
#endif // _WX_GENERIC_FONTDLGG_H #endif // _WX_GENERIC_FONTDLGG_H

View File

@@ -12,7 +12,7 @@
#ifndef __MSGDLGH_G__ #ifndef __MSGDLGH_G__
#define __MSGDLGH_G__ #define __MSGDLGH_G__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLG_H__ #ifndef __COLORDLG_H__
#define __COLORDLG_H__ #define __COLORDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -12,7 +12,7 @@
#ifndef __MSGDLG_H__ #ifndef __MSGDLG_H__
#define __MSGDLG_H__ #define __MSGDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

View File

@@ -12,7 +12,7 @@
#ifndef __COLORDLG_H__ #ifndef __COLORDLG_H__
#define __COLORDLG_H__ #define __COLORDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/msgdlg.h // Name: wx/gtk1/msgdlg.h
// Purpose: wxMessageDialog for GTK+2 // Purpose: wxMessageDialog for GTK+2
// Author: Vaclav Slavik // Author: Vaclav Slavik
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef __MSGDLG_H__ #ifndef __MSGDLG_H__
#define __MSGDLG_H__ #define __MSGDLG_H__
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO // type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colordlg.h // Name: wx/mac/carbon/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no // Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation. // platform-specific implementation.
// Author: Stefan Csomor // Author: Stefan Csomor
@@ -13,7 +13,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/mac/carbon/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -82,15 +82,15 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
{ {
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)
public: public:
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
@@ -105,7 +105,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
void SwapBuffers(); void SwapBuffers();
void UpdateContext(); void UpdateContext();
void SetViewport(); void SetViewport();
virtual bool Show(bool show = TRUE) ; virtual bool Show(bool show = true) ;
// Unlike some other platforms, this must get called if you override it. // Unlike some other platforms, this must get called if you override it.
// It sets the viewport correctly and update the context. // It sets the viewport correctly and update the context.

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/mac/carbon/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
@@ -36,8 +36,8 @@ public:
// override base class virtuals // override base class virtuals
virtual void SetText(const wxString& strName); virtual void SetText(const wxString& strName);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual void SetBitmap(const wxBitmap& bitmap) ; virtual void SetBitmap(const wxBitmap& bitmap) ;
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }

View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: colordlg.h // Name: wx/mac/classic/colordlg.h
// Purpose: wxColourDialog class. Use generic version if no // Purpose: wxColourDialog class. Use generic version if no
// platform-specific implementation. // platform-specific implementation.
// Author: Stefan Csomor // Author: Stefan Csomor
@@ -13,7 +13,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/mac/classic/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh // Purpose: wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
// Author: Stefan Csomor // Author: Stefan Csomor
// Modified by: // Modified by:
@@ -12,7 +12,7 @@
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -82,15 +82,15 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
{ {
DECLARE_CLASS(wxGLCanvas) DECLARE_CLASS(wxGLCanvas)
public: public:
wxGLCanvas(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxGLCanvas(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette); const wxString& name = wxT("GLCanvas") , int *attribList = 0, const wxPalette& palette = wxNullPalette);
wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"), const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette ); int *attribList = (int*) NULL, const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette ); const wxString& name = wxT("GLCanvas"), int *attribList = 0, const wxPalette& palette = wxNullPalette );
@@ -105,7 +105,7 @@ class WXDLLEXPORT wxGLCanvas: public wxWindow
void SwapBuffers(); void SwapBuffers();
void UpdateContext(); void UpdateContext();
void SetViewport(); void SetViewport();
virtual bool Show(bool show = TRUE) ; virtual bool Show(bool show = true) ;
// Unlike some other platforms, this must get called if you override it. // Unlike some other platforms, this must get called if you override it.
// It sets the viewport correctly and update the context. // It sets the viewport correctly and update the context.

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/mac/classic/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour // wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
@@ -36,8 +36,8 @@ public:
// override base class virtuals // override base class virtuals
virtual void SetText(const wxString& strName); virtual void SetText(const wxString& strName);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual void SetBitmap(const wxBitmap& bitmap) ; virtual void SetBitmap(const wxBitmap& bitmap) ;
virtual const wxBitmap& GetBitmap() const { return m_bitmap; } virtual const wxBitmap& GetBitmap() const { return m_bitmap; }

View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@@ -12,7 +12,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -12,7 +12,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: menuitem.h // Name: wx/os2/menuitem.h
// Purpose: wxMenuItem class // Purpose: wxMenuItem class
// Author: Vadim Zeitlin // Author: Vadim Zeitlin
// Modified by: // Modified by:
@@ -16,7 +16,7 @@
// headers // headers
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#include "wx/setup.h" #include "wx/defs.h"
// an exception to the general rule that a normal header doesn't include other // an exception to the general rule that a normal header doesn't include other
// headers - only because ownerdrw.h is not always included and I don't want // headers - only because ownerdrw.h is not always included and I don't want
@@ -67,8 +67,8 @@ public:
virtual void SetText(const wxString& rStrName); virtual void SetText(const wxString& rStrName);
virtual void SetCheckable(bool bCheckable); virtual void SetCheckable(bool bCheckable);
virtual void Enable(bool bDoEnable = TRUE); virtual void Enable(bool bDoEnable = true);
virtual void Check(bool bDoCheck = TRUE); virtual void Check(bool bDoCheck = true);
virtual bool IsChecked(void) const; virtual bool IsChecked(void) const;
// //

View File

@@ -13,7 +13,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

View File

@@ -12,7 +12,7 @@
#ifndef _WX_COLORDLG_H_ #ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_ #define _WX_COLORDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
#include "wx/cmndata.h" #include "wx/cmndata.h"

View File

@@ -12,7 +12,7 @@
#ifndef _WX_MSGBOXDLG_H_ #ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_ #define _WX_MSGBOXDLG_H_
#include "wx/setup.h" #include "wx/defs.h"
#include "wx/dialog.h" #include "wx/dialog.h"
/* /*

View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.h // Name: wx/x11/glcanvas.h
// Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif. // Purpose: wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
// Uses the GLX extension. // Uses the GLX extension.
// Author: Julian Smart and Wolfram Gloger // Author: Julian Smart and Wolfram Gloger
@@ -13,7 +13,7 @@
#ifndef _WX_GLCANVAS_H_ #ifndef _WX_GLCANVAS_H_
#define _WX_GLCANVAS_H_ #define _WX_GLCANVAS_H_
#include "wx/setup.h" #include "wx/defs.h"
#if wxUSE_GLCANVAS #if wxUSE_GLCANVAS
@@ -93,21 +93,21 @@ public:
m_vi = (void*) NULL; m_vi = (void*) NULL;
// m_exposed = FALSE; // m_exposed = FALSE;
} }
wxGLCanvas( wxWindow *parent, wxWindowID id = -1, wxGLCanvas( wxWindow *parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"), long style = 0, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxGLCanvas( wxWindow *parent, const wxGLContext *shared,
wxWindowID id = -1, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"), long style = 0, const wxString& name = wxT("GLCanvas"),
int *attribList = (int*) NULL, int *attribList = (int*) NULL,
const wxPalette& palette = wxNullPalette ); const wxPalette& palette = wxNullPalette );
wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared,
wxWindowID id = -1, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"), long style = 0, const wxString& name = wxT("GLCanvas"),
@@ -117,7 +117,7 @@ public:
bool Create( wxWindow *parent, bool Create( wxWindow *parent,
const wxGLContext *shared = (wxGLContext*)NULL, const wxGLContext *shared = (wxGLContext*)NULL,
const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL, const wxGLCanvas *shared_context_of = (wxGLCanvas*)NULL,
wxWindowID id = -1, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = 0, const wxString& name = wxT("GLCanvas"), long style = 0, const wxString& name = wxT("GLCanvas"),