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

Include wx/cmndata.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-25 21:08:11 +00:00
parent 6643c354c5
commit ce5d92e150
18 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/dirctrlg.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/icon.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/cmndata.h"
#endif
#include "wx/module.h"
@@ -36,7 +37,6 @@
#include "wx/textctrl.h"
#include "wx/textdlg.h"
#include "wx/filefn.h"
#include "wx/cmndata.h"
#include "wx/gdicmn.h"
#include "wx/imaglist.h"
#include "wx/sizer.h"

2
src/generic/fontdlgg.cpp
View File

@@ -31,12 +31,12 @@
#include "wx/checkbox.h"
#include "wx/intl.h"
#include "wx/settings.h"
#include "wx/cmndata.h"
#endif
#include <string.h>
#include <stdlib.h>
#include "wx/cmndata.h"
#include "wx/sizer.h"
#include "wx/fontdlg.h"
#include "wx/generic/fontdlgg.h"

2
src/gtk/font.cpp
View File

@@ -24,10 +24,10 @@
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#include "wx/cmndata.h"
#include "wx/gdicmn.h"
#include "wx/tokenzr.h"

5
src/gtk/settings.cpp
View File

@@ -13,7 +13,10 @@
#include "wx/settings.h"
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#include "wx/toplevel.h"

2
src/gtk1/font.cpp
View File

@@ -23,10 +23,10 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/settings.h"
#include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#include "wx/cmndata.h"
#include "wx/utils.h"
#include "wx/gdicmn.h"
#include "wx/tokenzr.h"

5
src/gtk1/settings.cpp
View File

@@ -13,7 +13,10 @@
#include "wx/settings.h"
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#include "wx/toplevel.h"

2
src/mac/carbon/dirdlg.cpp
View File

@@ -18,9 +18,9 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#endif // WX_PRECOMP
#include "wx/cmndata.h"
#include "wx/filename.h"
#include "wx/mac/private.h"

2
src/mac/carbon/fontdlgosx.mm
View File

@@ -24,9 +24,9 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/cmndata.h"
#endif
#include "wx/cmndata.h"
#include "wx/fontutil.h"
// ============================================================================

3
src/mac/classic/dirdlg.cpp
View File

@@ -20,10 +20,9 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#endif // WX_PRECOMP
#include "wx/cmndata.h"
#include "wx/mac/private.h"
#ifdef __DARWIN__

14
src/mac/classic/fontdlg.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: fontdlg.cpp
// Name: src/mac/classic/fontdlg.cpp
// Purpose: wxFontDialog class. NOTE: you can use the generic class
// if you wish, instead of implementing this.
// Author: Stefan Csomor
@@ -7,11 +7,16 @@
// Created: 1998-01-01
// RCS-ID: $Id$
// Copyright: (c) Stefan Csomor
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#include "wx/mac/fontdlg.h"
#include "wx/cmndata.h"
#ifndef WX_PRECOMP
#include "wx/cmndata.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
@@ -37,7 +42,7 @@ bool wxFontDialog::Create(wxWindow *parent, const wxFontData& data)
// TODO: you may need to do dialog creation here, unless it's
// done in ShowModal.
return TRUE;
return true;
}
int wxFontDialog::ShowModal()
@@ -45,4 +50,3 @@ int wxFontDialog::ShowModal()
// TODO: show (maybe create) the dialog
return wxID_CANCEL;
}

2
src/mgl/font.cpp
View File

@@ -27,10 +27,10 @@
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/cmndata.h"
#endif
#include "wx/fontutil.h"
#include "wx/cmndata.h"
#include "wx/gdicmn.h"
#include "wx/tokenzr.h"
#include "wx/mgl/private.h"

9
src/msw/colordlg.cpp
View File

@@ -24,19 +24,20 @@
#pragma hdrstop
#endif
#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#include "wx/colordlg.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/cmndata.h"
#endif
#if wxUSE_COLOURDLG && !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
#include "wx/msw/private.h"
#include "wx/colordlg.h"
#include "wx/cmndata.h"
#include "wx/math.h"
#include "wx/msw/wrapcdlg.h"

5
src/msw/fontdlg.cpp
View File

@@ -26,16 +26,17 @@
#if wxUSE_FONTDLG
#include "wx/fontdlg.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/cmndata.h"
#endif
#include "wx/fontdlg.h"
#include "wx/msw/wrapcdlg.h"
#include "wx/cmndata.h"
#include "wx/math.h"
#include <stdlib.h>

2
src/msw/printdlg.cpp
View File

@@ -31,9 +31,9 @@
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/dcprint.h"
#include "wx/cmndata.h"
#endif
#include "wx/cmndata.h"
#include "wx/printdlg.h"
#include "wx/msw/printdlg.h"
#include "wx/paper.h"

5
src/os2/dirdlg.cpp
View File

@@ -12,15 +12,16 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/dirdlg.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/dirdlg.h"
#include "wx/cmndata.h"
#endif
#include "wx/os2/private.h"
#include "wx/cmndata.h"
#include <stdlib.h>
#include <string.h>

13
src/os2/fontdlg.cpp
View File

@@ -13,21 +13,22 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/fontdlg.h"
#ifndef WX_PRECOMP
#include <stdio.h>
#include "wx/utils.h"
#include "wx/dialog.h"
#include "wx/math.h"
#include "wx/cmndata.h"
#endif
#include "wx/fontdlg.h"
#include "wx/fontutil.h"
#define INCL_PM
#include <os2.h>
#include "wx/os2/private.h"
#include "wx/cmndata.h"
#include <stdlib.h>
#include <string.h>
@@ -36,10 +37,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
int wxFontDialog::ShowModal()
{
FONTDLG vFontDlg;
char zCurrentFont[FACESIZE];
HWND hWndFontDlg;
FACENAMEDESC vFn;
FONTDLG vFontDlg;
char zCurrentFont[FACESIZE];
HWND hWndFontDlg;
FACENAMEDESC vFn;
memset(&vFontDlg, '\0', sizeof(FONTDLG));
zCurrentFont[0] = '\0';

10
src/palmos/colordlg.cpp
View File

@@ -24,15 +24,15 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/intl.h"
#endif
#if wxUSE_COLOURDLG
#include "wx/cmndata.h"
#include "wx/colordlg.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/cmndata.h"
#endif
#include <UIColor.h>
#include <UIControls.h>

3
src/palmos/fontdlg.cpp
View File

@@ -33,12 +33,11 @@
#include "wx/dialog.h"
#include "wx/math.h"
#include "wx/log.h"
#include "wx/cmndata.h"
#endif
#include "wx/palmos/private.h"
#include "wx/cmndata.h"
#include <stdlib.h>
#include <string.h>