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

Include wx/event.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@38939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-04-27 12:47:14 +00:00
parent 07b6378fcb
commit d5da0ce7cb
22 changed files with 115 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/event.cpp
View File

@@ -24,6 +24,8 @@
#pragma hdrstop
#endif
#include "wx/event.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/app.h"
@@ -36,7 +38,6 @@
#endif // wxUSE_GUI
#endif
#include "wx/event.h"
#include "wx/module.h"
#if wxUSE_GUI

2
src/common/gdicmn.cpp
View File

@@ -24,9 +24,9 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/event.h"
#endif
#include "wx/event.h"
#include "wx/brush.h"
#include "wx/pen.h"
#include "wx/bitmap.h"

19
src/common/sckipc.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: sckipc.cpp
// Name: src/common/sckipc.cpp
// Purpose: Interprocess communication implementation (wxSocket version)
// Author: Julian Smart
// Modified by: Guilhem Lavaux (big rewrite) May 1997, 1998
@@ -26,23 +26,24 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/log.h"
#pragma hdrstop
#endif
#if wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS
#include "wx/sckipc.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/event.h"
#endif
#include <stdlib.h>
#include <stdio.h>
#include <errno.h>
#include "wx/socket.h"
#include "wx/sckipc.h"
#include "wx/module.h"
#include "wx/event.h"
// --------------------------------------------------------------------------
// macros and constants
@@ -752,4 +753,4 @@ IMPLEMENT_DYNAMIC_CLASS(wxTCPEventHandlerModule, wxModule)
#endif
// wxUSE_SOCKETS && wxUSE_IPC
// wxUSE_SOCKETS && wxUSE_IPC && wxUSE_STREAMS

2
src/common/socket.cpp
View File

@@ -29,6 +29,7 @@
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"
#endif
#include "wx/app.h"
@@ -36,7 +37,6 @@
#include "wx/timer.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/event.h"
#include "wx/sckaddr.h"
#include "wx/datetime.h"

10
src/common/textcmn.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: common/textcmn.cpp
// Name: src/common/textcmn.cpp
// Purpose: implementation of platform-independent functions of wxTextCtrl
// Author: Julian Smart
// Modified by:
@@ -20,12 +20,17 @@
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif // WX_PRECOMP
#if wxUSE_TEXTCTRL
#include "wx/textctrl.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/textctrl.h"
#endif // WX_PRECOMP
#include "wx/ffile.h"
@@ -517,7 +522,6 @@ wxTextCtrlBase::HitTest(const wxPoint& WXUNUSED(pt),
// define this one even if !wxUSE_TEXTCTRL because it is also used by other
// controls (wxComboBox and wxSpinCtrl)
#include "wx/event.h"
DEFINE_EVENT_TYPE(wxEVT_COMMAND_TEXT_UPDATED)

6
src/common/xtistrm.cpp
View File

@@ -18,16 +18,16 @@
#if wxUSE_EXTENDED_RTTI
#include "wx/xtistrm.h"
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/hash.h"
#include "wx/event.h"
#endif
#include "wx/tokenzr.h"
#include "wx/txtstrm.h"
#include "wx/event.h"
#include "wx/xtistrm.h"
#include "wx/beforestd.h"
#include <map>

5
src/common/xtixml.cpp
View File

@@ -18,18 +18,19 @@
#if wxUSE_EXTENDED_RTTI
#include "wx/xtixml.h"
#ifndef WX_PRECOMP
#include "wx/object.h"
#include "wx/hash.h"
#include "wx/event.h"
#endif
#include "wx/xml/xml.h"
#include "wx/tokenzr.h"
#include "wx/txtstrm.h"
#include "wx/event.h"
#include "wx/xtistrm.h"
#include "wx/xtixml.h"
#include "wx/beforestd.h"
#include <map>

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

@@ -24,6 +24,7 @@
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"
#endif
#include "wx/app.h"
@@ -31,7 +32,6 @@
#include "wx/timer.h"
#include "wx/utils.h"
#include "wx/module.h"
#include "wx/event.h"
#include "wx/sckaddr.h"
#include "wx/mac/carbon/private.h"

8
src/mac/classic/data.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: mac/data.cpp
// Name: src/mac/classic/data.cpp
// Purpose: Various global Mac-specific data
// Author: Stefan Csomor
// Modified by:
@@ -9,4 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/event.h"
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif

2
src/mac/corefoundation/hidjoystick.cpp
View File

@@ -33,9 +33,9 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/event.h" //joystick wxEvents
#endif
#include "wx/event.h" //joystick wxEvents
#include "wx/joystick.h" //...
#include "wx/thread.h" //wxThread for polling thread/ wxCriticalSection
#include "wx/window.h" //for wxWindow to "capture" joystick

3
src/motif/evtloop.cpp
View File

@@ -26,10 +26,10 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif //WX_PRECOMP
#include "wx/evtloop.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/window.h"
@@ -477,4 +477,3 @@ bool wxAddIdleCallback()
return true;
}

8
src/msw/main.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: msw/main.cpp
// Name: src/msw/main.cpp
// Purpose: WinMain/DllMain
// Author: Julian Smart
// Modified by:
@@ -24,7 +24,10 @@
#pragma hdrstop
#endif
#include "wx/event.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif //WX_PRECOMP
#include "wx/app.h"
#include "wx/cmdline.h"
#include "wx/scopeguard.h"
@@ -403,4 +406,3 @@ void wxSetInstance(HINSTANCE hInst)
}
#endif // wxUSE_BASE

2
src/msw/notebook.cpp
View File

@@ -24,10 +24,10 @@
#include "wx/string.h"
#include "wx/dc.h"
#include "wx/log.h"
#include "wx/event.h"
#endif // WX_PRECOMP
#include "wx/imaglist.h"
#include "wx/event.h"
#include "wx/control.h"
#include "wx/app.h"
#include "wx/sysopt.h"

2
src/msw/regconf.cpp
View File

@@ -24,9 +24,9 @@
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"
#endif //WX_PRECOMP
#include "wx/event.h"
#include "wx/app.h"
#include "wx/msw/registry.h"

27
src/os2/control.cpp
View File

@@ -13,12 +13,13 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/scrolwin.h"
#include "wx/log.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/dcclient.h"
#include "wx/scrolwin.h"
#include "wx/log.h"
#endif
#include "wx/os2/private.h"
#include "wx/control.h"
@@ -33,15 +34,13 @@ wxControl::wxControl()
{
} // end of wxControl::wxControl
bool wxControl::Create(
wxWindow* pParent
, wxWindowID vId
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxValidator& rValidator
, const wxString& rsName
)
bool wxControl::Create( wxWindow* pParent,
wxWindowID vId,
const wxPoint& rPos,
const wxSize& rSize,
long lStyle,
const wxValidator& rValidator,
const wxString& rsName )
{
bool bRval = wxWindow::Create( pParent
,vId

4
src/os2/notebook.cpp
View File

@@ -22,11 +22,11 @@
#include "wx/dcclient.h"
#include "wx/string.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/log.h"
#include "wx/event.h"
#endif // WX_PRECOMP
#include "wx/imaglist.h"
#include "wx/event.h"
#include "wx/control.h"
#include "wx/os2/private.h"

77
src/os2/stattext.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: stattext.cpp
// Name: src/os2/stattext.cpp
// Purpose: wxStaticText
// Author: David Webster
// Modified by:
@@ -13,10 +13,10 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/app.h"
#include "wx/brush.h"
#include "wx/scrolwin.h"
#include "wx/event.h"
#include "wx/app.h"
#include "wx/brush.h"
#include "wx/scrolwin.h"
#endif
#include "wx/stattext.h"
@@ -25,15 +25,13 @@
IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
bool wxStaticText::Create(
wxWindow* pParent
, wxWindowID vId
, const wxString& rsLabel
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxString& rsName
)
bool wxStaticText::Create( wxWindow* pParent,
wxWindowID vId,
const wxString& rsLabel,
const wxPoint& rPos,
const wxSize& rSize,
long lStyle,
const wxString& rsName )
{
SetName(rsName);
if (pParent)
@@ -42,19 +40,19 @@ bool wxStaticText::Create(
SetBackgroundColour(pParent->GetBackgroundColour()) ;
SetForegroundColour(pParent->GetForegroundColour()) ;
if ( vId == -1 )
if ( vId == wxID_ANY )
m_windowId = (int)NewControlId();
else
m_windowId = vId;
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
int nX = rPos.x;
int nY = rPos.y;
int nWidth = rSize.x;
int nHeight = rSize.y;
m_windowStyle = lStyle;
long lSstyle = 0L;
long lSstyle = 0L;
// Used to have DT_VCENTER but that doesn't work correctly with
// multiline strings and DT_WORDBREAK. Accept a reasonable
@@ -67,7 +65,7 @@ bool wxStaticText::Create(
else
lSstyle |= DT_LEFT;
wxString sLabel = ::wxPMTextToLabel(rsLabel);
wxString sLabel = ::wxPMTextToLabel(rsLabel);
m_hWnd = (WXHWND)::WinCreateWindow( (HWND)GetHwndOf(pParent) // Parent window handle
,WC_STATIC // Window class
@@ -81,13 +79,9 @@ bool wxStaticText::Create(
,NULL // no Presentation parameters
);
wxCHECK_MSG(m_hWnd, FALSE, wxT("Failed to create static ctrl"));
wxCHECK_MSG(m_hWnd, false, wxT("Failed to create static ctrl"));
wxColour vColour;
vColour.Set(wxString(wxT("BLACK")));
LONG lColor = (LONG)vColour.GetPixel();
LONG lColor = (LONG)wxBLACK->GetPixel();
::WinSetPresParam( m_hWnd
,PP_FOREGROUNDCOLOR
@@ -106,24 +100,21 @@ bool wxStaticText::Create(
SetFont(*wxSMALL_FONT);
SetXComp(0);
SetYComp(0);
SetSize( nX
,nY
,nWidth
,nHeight
);
return TRUE;
SetSize( nX, nY, nWidth, nHeight );
return true;
} // end of wxStaticText::Create
wxSize wxStaticText::DoGetBestSize() const
{
wxString sText(wxGetWindowText(GetHWND()));
int nWidthTextMax = 0;
int nWidthLine = 0;
int nHeightTextTotal = 0;
int nHeightLineDefault = 0;
int nHeightLine = 0;
wxString sCurLine;
bool bLastWasTilde = FALSE;
wxString sText(wxGetWindowText(GetHWND()));
int nWidthTextMax = 0;
int nWidthLine = 0;
int nHeightTextTotal = 0;
int nHeightLineDefault = 0;
int nHeightLine = 0;
wxString sCurLine;
bool bLastWasTilde = false;
for (const wxChar *pc = sText; ; pc++)
{
@@ -174,7 +165,7 @@ wxSize wxStaticText::DoGetBestSize() const
{
if (!bLastWasTilde)
{
bLastWasTilde = TRUE;
bLastWasTilde = true;
//
// Skip the statement adding pc to curLine below
@@ -185,7 +176,7 @@ wxSize wxStaticText::DoGetBestSize() const
//
// It is a literal tilde
//
bLastWasTilde = FALSE;
bLastWasTilde = false;
}
sCurLine += *pc;
}

5
src/palmos/main.cpp
View File

@@ -24,7 +24,10 @@
#pragma hdrstop
#endif
#include "wx/event.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif //WX_PRECOMP
#include "wx/app.h"
#include "wx/cmdline.h"

14
src/palmos/stattext.cpp
View File

@@ -13,19 +13,19 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_STATTEXT
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/app.h"
#include "wx/brush.h"
#endif
#include "wx/stattext.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#include "wx/app.h"
#include "wx/brush.h"
#endif
#include <Field.h>
#if wxUSE_EXTENDED_RTTI

2
src/unix/dialup.cpp
View File

@@ -20,9 +20,9 @@
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/event.h"
#endif // !PCH
#include "wx/event.h"
#include "wx/timer.h"
#include "wx/filefn.h"
#include "wx/utils.h"

5
src/unix/joystick.cpp
View File

@@ -16,6 +16,10 @@
#include "wx/joystick.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif //WX_PRECOMP
#include <linux/joystick.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -24,7 +28,6 @@
#include <fcntl.h>
#include <unistd.h>
#include "wx/event.h"
#include "wx/window.h"
#include "wx/unix/private.h"

8
src/xrc/xh_cald.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: xh_cald.cpp
// Name: src/xrc/xh_cald.cpp
// Purpose: XRC resource for wxCalendarCtrl
// Author: Brian Gavin
// Created: 2000/09/09
@@ -18,7 +18,11 @@
#if wxUSE_XRC && wxUSE_CALENDARCTRL
#include "wx/xrc/xh_cald.h"
#include "wx/event.h"
#ifndef WX_PRECOMP
#include "wx/event.h"
#endif //WX_PRECOMP
#include "wx/calctrl.h"
IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)