Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-01-26 16:02:02 +00:00
parent b7ba00e77a
commit 9b5f189564
23 changed files with 47 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/bmpbase.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: bitmap.cpp
// Name: src/common/bitmap.cpp
// Purpose: wxBitmapBase
// Author: VaclavSlavik
// Created: 2001/04/11
@@ -21,7 +21,6 @@
defined(__WXMOTIF__) || \
defined(__WXX11__)
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/palette.h"
#include "wx/bitmap.h"

3
src/common/imagall.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: imagall.cpp
// Name: src/common/imagall.cpp
// Purpose: wxImage access all handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
@@ -15,7 +15,6 @@
#endif
#ifndef WX_PRECOMP
# include "wx/setup.h"
#endif
#include "wx/image.h"

3
src/common/imagpnm.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: imagpnm.cpp
// Name: src/common/imagpnm.cpp
// Purpose: wxImage PNM handler
// Author: Sylvain Bougnoux
// RCS-ID: $Id$
@@ -15,7 +15,6 @@
#endif
#ifndef WX_PRECOMP
# include "wx/setup.h"
#endif
#if wxUSE_IMAGE && wxUSE_PNM

2
src/generic/dcpsg.cpp
View File

@@ -22,8 +22,6 @@
#if wxUSE_POSTSCRIPT
#include "wx/setup.h"
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/intl.h"

3
src/generic/dragimgg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dragimgg.cpp
// Name: src/generic/dragimgg.cpp
// Purpose: Generic wxDragImage implementation
// Author: Julian Smart
// Modified by:
@@ -28,7 +28,6 @@
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
#include "wx/window.h"
#include "wx/frame.h"
#include "wx/dcclient.h"

1
src/generic/helpext.cpp
View File

@@ -18,7 +18,6 @@
#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/list.h"

1
src/generic/statusbr.cpp
View File

@@ -19,7 +19,6 @@
#if wxUSE_STATUSBAR
#ifndef WX_PRECOMP
#include "wx/setup.h"
#include "wx/frame.h"
#include "wx/settings.h"
#include "wx/dcclient.h"

5
src/gtk/filedlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/filedlg.cpp
// Name: src/gtk/filedlg.cpp
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
@@ -10,9 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
#include "wx/setup.h"
#if wxUSE_FILEDLG
#include "wx/filedlg.h"

4
src/gtk/glcanvas.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/glcanvas.cpp
// Name: src/gtk/glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
@@ -12,8 +12,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"

5
src/gtk/gsockgtk.cpp
View File

@@ -1,12 +1,13 @@
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
* Name: gsockgtk.c
* Name: src/gtk/gsockgtk.cpp
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
#include "wx/setup.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_SOCKETS

5
src/gtk/tooltip.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: tooltip.cpp
// Name: src/gtk/tooltip.cpp
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
@@ -10,8 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
@@ -79,4 +77,3 @@ void wxToolTip::SetDelay( long msecs )
}
#endif

5
src/gtk1/filedlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/filedlg.cpp
// Name: src/gtk1/filedlg.cpp
// Purpose: native implementation of wxFileDialog
// Author: Robert Roebling, Zbigniew Zagorski, Mart Raudsepp
// Id: $Id$
@@ -10,9 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// Include setup.h to get wxUSE flags for compilers that do not support precompilation of headers
#include "wx/setup.h"
#if wxUSE_FILEDLG
#include "wx/filedlg.h"

4
src/gtk1/glcanvas.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gtk/glcanvas.cpp
// Name: src/gtk1/glcanvas.cpp
// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
@@ -12,8 +12,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"

5
src/gtk1/gsockgtk.cpp
View File

@@ -1,12 +1,13 @@
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket) for WX
* Name: gsockgtk.c
* Name: src/gtk1/gsockgtk.cpp
* Purpose: GSocket: GTK part
* Licence: The wxWindows licence
* CVSID: $Id$
* -------------------------------------------------------------------------
*/
#include "wx/setup.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_SOCKETS

5
src/gtk1/tooltip.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: tooltip.cpp
// Name: src/gtk1/tooltip.cpp
// Purpose: wxToolTip implementation
// Author: Robert Roebling
// Id: $Id$
@@ -10,8 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
@@ -79,4 +77,3 @@ void wxToolTip::SetDelay( long msecs )
}
#endif

6
src/mgl/gdiobj.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: gdiobj.cpp
// Name: src/mgl/gdiobj.cpp
// Purpose: wxGDIObject class
// Author: Julian Smart
// Modified by:
@@ -18,7 +18,6 @@
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/setup.h"
#include "wx/list.h"
#include "wx/utils.h"
#endif
@@ -27,6 +26,3 @@
IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)

1
src/mgl/window.cpp
View File

@@ -27,7 +27,6 @@
#include "wx/window.h"
#include "wx/msgdlg.h"
#include "wx/accel.h"
#include "wx/setup.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/utils.h"

1
src/motif/accel.cpp
View File

@@ -12,7 +12,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#include "wx/accel.h"
#include "wx/string.h"
#include "wx/utils.h"

2
src/motif/combobox.cpp
View File

@@ -12,8 +12,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"

6
src/motif/combobox_native.cpp
View File

@@ -12,8 +12,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_COMBOBOX
#include "wx/combobox.h"
@@ -115,8 +113,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
(XtPointer) this);
wxSize best = GetBestSize();
if( size.x != -1 ) best.x = size.x;
if( size.y != -1 ) best.y = size.y;
if( size.x != wxDefaultCoord ) best.x = size.x;
if( size.y != wxDefaultCoord ) best.y = size.y;
AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
pos.x, pos.y, best.x, best.y);

4
src/motif/dnd.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: dnd.cpp
// Name: src/motif/dnd.cpp
// Purpose: wxDropTarget, wxDropSource classes
// Author: Julian Smart
// Id: $Id$
@@ -10,8 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/setup.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"

1
src/motif/utils.cpp
View File

@@ -24,7 +24,6 @@
#define XtDisplay XTDISPLAY
#endif
#include "wx/setup.h"
#include "wx/utils.h"
#include "wx/apptrait.h"
#include "wx/app.h"

3
src/motif/window.cpp
View File

@@ -26,7 +26,6 @@
#define XtScreen XTSCREEN
#endif
#include "wx/setup.h"
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
@@ -2492,7 +2491,7 @@ void wxWindow::ChangeFont(bool keepOriginalSize)
GetSize(& width1, & height1);
if (keepOriginalSize && (width != width1 || height != height1))
{
SetSize(-1, -1, width, height);
SetSize(wxDefaultCoord, wxDefaultCoord, width, height);
}
}
}