AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include wx/module.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@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2006-08-31 19:31:43 +00:00
parent 1486fb5f10
commit 02761f6cd4
107 changed files with 302 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/module.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: module.h
// Name: wx/module.h
// Purpose: Modules handling
// Author: Wolfram Gloger/adapted by Guilhem Lavaux
// Modified by:
@ -85,7 +85,7 @@ private:
static void DoCleanUpModules(const wxModuleList& modules);
// module dependencies: contains
// module dependencies: contains
wxArrayClassInfo m_dependencies;
// used internally while initiliazing/cleaning up modules
@ -101,4 +101,3 @@ private:
};
#endif // _WX_MODULE_H_

1
include/wx/wx.h
View File

@ -29,6 +29,7 @@
#include "wx/memory.h"
#include "wx/math.h"
#include "wx/stopwatch.h"
#include "wx/module.h"
#if wxUSE_GUI

3
src/cocoa/app.mm
View File

@ -17,10 +17,9 @@
#include "wx/dc.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/cocoa/ObjcPose.h"
#include "wx/cocoa/autorelease.h"
#include "wx/cocoa/mbarman.h"

5
src/cocoa/fontutil.cpp
View File

@ -24,15 +24,16 @@
#pragma hdrstop
#endif
#include "wx/fontutil.h"
#ifndef WX_PRECOMP
#include "wx/hash.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif // PCH
#include "wx/fontutil.h"
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
#include "wx/encinfo.h"
#ifdef __WXGTK20__

6
src/common/artprov.cpp
View File

@ -20,16 +20,16 @@
#pragma hdrstop
#endif
#include "wx/artprov.h"
#ifndef WX_PRECOMP
#include "wx/list.h"
#include "wx/log.h"
#include "wx/hashmap.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/artprov.h"
#include "wx/module.h"
// ===========================================================================
// implementation
// ===========================================================================

3
src/common/bmpbase.cpp
View File

@ -30,10 +30,9 @@
#include "wx/palette.h"
#include "wx/icon.h"
#include "wx/image.h"
#include "wx/module.h"
#endif // WX_PRECOMP
#include "wx/module.h"
IMPLEMENT_ABSTRACT_CLASS(wxBitmapBase, wxGDIObject)
IMPLEMENT_ABSTRACT_CLASS(wxBitmapHandlerBase,wxObject)

11
src/common/clipcmn.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: common/clipcmn.cpp
// Name: src/common/clipcmn.cpp
// Purpose: common (to all ports) wxClipboard functions
// Author: Robert Roebling
// Modified by:
@ -24,11 +24,14 @@
#pragma hdrstop
#endif
#include "wx/clipbrd.h"
#include "wx/module.h"
#if wxUSE_CLIPBOARD
#include "wx/clipbrd.h"
#ifndef WX_PRECOMP
#include "wx/module.h"
#endif
static wxClipboard *gs_clipboard = NULL;
/*static*/ wxClipboard *wxClipboardBase::Get()

2
src/common/cshelp.cpp
View File

@ -28,10 +28,10 @@
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/module.h"
#endif
#include "wx/tipwin.h"
#include "wx/module.h"
#include "wx/cshelp.h"
// wxUSE_MS_HTML_HELP is not defined under platforms other than MSW

2
src/common/datetime.cpp
View File

@ -70,11 +70,11 @@
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/stopwatch.h" // for wxGetLocalTimeMillis()
#include "wx/module.h"
#endif // WX_PRECOMP
#include "wx/thread.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
#include <ctype.h>

2
src/common/dpycmn.cpp
View File

@ -27,11 +27,11 @@
#ifndef WX_PRECOMP
#include "wx/gdicmn.h"
#include "wx/window.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/display.h"
#include "wx/display_impl.h"
#include "wx/module.h"
#if wxUSE_DISPLAY

5
src/common/dynload.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dynload.cpp
// Name: src/common/dynload.cpp
// Purpose: Dynamic loading framework
// Author: Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's
// (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux)
@ -31,12 +31,12 @@
#include "wx/intl.h"
#include "wx/hash.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#include "wx/strconv.h"
#include "wx/dynload.h"
#include "wx/module.h"
// ---------------------------------------------------------------------------
@ -360,4 +360,3 @@ void wxPluginManager::Unload()
}
#endif // wxUSE_DYNAMIC_LOADER

3
src/common/event.cpp
View File

@ -31,6 +31,7 @@
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/stopwatch.h"
#include "wx/module.h"
#if wxUSE_GUI
#include "wx/control.h"
@ -40,8 +41,6 @@
#endif // wxUSE_GUI
#endif
#include "wx/module.h"
// ----------------------------------------------------------------------------
// wxWin macros
// ----------------------------------------------------------------------------

2
src/common/filesys.cpp
View File

@ -20,10 +20,10 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/wfstream.h"
#include "wx/module.h"
#include "wx/mimetype.h"
#include "wx/filename.h"
#include "wx/tokenzr.h"

15
src/common/fmapbase.cpp
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: common/fmapbase.cpp
// Name: src/common/fmapbase.cpp
// Purpose: wxFontMapperBase class implementation
// Author: Vadim Zeitlin
// Modified by:
@ -30,18 +30,18 @@
#include "wx/app.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#if defined(__WXMSW__)
#include "wx/msw/private.h" // includes windows.h for LOGFONT
#include "wx/msw/winundef.h"
#include "wx/msw/private.h" // includes windows.h for LOGFONT
#include "wx/msw/winundef.h"
#endif
#include "wx/fontmap.h"
#include "wx/fmappriv.h"
#include "wx/apptrait.h"
#include "wx/module.h"
// wxMemoryConfig uses wxFileConfig
#if wxUSE_CONFIG && wxUSE_FILECONFIG
@ -344,7 +344,7 @@ const wxChar *wxFontMapperBase::GetDefaultConfigPath()
void wxFontMapperBase::SetConfigPath(const wxString& prefix)
{
wxCHECK_RET( !prefix.IsEmpty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
wxCHECK_RET( !prefix.empty() && prefix[0] == wxCONFIG_PATH_SEPARATOR,
wxT("an absolute path should be given to wxFontMapper::SetConfigPath()") );
m_configRootPath = prefix;
@ -399,7 +399,7 @@ bool wxFontMapperBase::ChangePath(const wxString& pathNew, wxString *pathOld)
*pathOld = config->GetPath();
wxString path = GetConfigPath();
if ( path.IsEmpty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
if ( path.empty() || path.Last() != wxCONFIG_PATH_SEPARATOR )
{
path += wxCONFIG_PATH_SEPARATOR;
}
@ -482,7 +482,7 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
config->SetPath(FONTMAPPER_CHARSET_ALIAS_PATH);
wxString alias = config->Read(charset);
if ( !alias.IsEmpty() )
if ( !alias.empty() )
{
// yes, we do - use it instead
cs = alias;
@ -731,4 +731,3 @@ wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
}
#endif // wxUSE_FONTMAP

7
src/common/fs_inet.cpp
View File

@ -1,15 +1,16 @@
/////////////////////////////////////////////////////////////////////////////
// Name: fs_inet.cpp
// Name: src/common/fs_inet.cpp
// Purpose: HTTP and FTP file system
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// RCS-ID: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if !wxUSE_SOCKETS
@ -20,13 +21,13 @@
#if wxUSE_FILESYSTEM && wxUSE_FS_INET
#ifndef WXPRECOMP
#include "wx/module.h"
#endif
#include "wx/wfstream.h"
#include "wx/url.h"
#include "wx/filesys.h"
#include "wx/fs_inet.h"
#include "wx/module.h"
// ----------------------------------------------------------------------------
// Helper classes

2
src/common/imagbmp.cpp
View File

@ -20,13 +20,13 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/module.h"
#endif
#include "wx/imagbmp.h"
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
#include "wx/module.h"
#include "wx/quantize.h"
// For memcpy

2
src/common/image.cpp
View File

@ -25,12 +25,12 @@
#include "wx/utils.h"
#include "wx/bitmap.h"
#include "wx/math.h"
#include "wx/module.h"
#endif
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
#include "wx/module.h"
#if wxUSE_XPM
#include "wx/xpmdecod.h"

2
src/common/imagjpeg.cpp
View File

@ -23,6 +23,7 @@
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/bitmap.h"
#include "wx/module.h"
#endif
// NB: Some compilers define boolean type in Windows headers
@ -45,7 +46,6 @@ extern "C"
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/module.h"
// For memcpy
#include <string.h>

2
src/common/imagpcx.cpp
View File

@ -24,11 +24,11 @@
#include "wx/intl.h"
#include "wx/palette.h"
#include "wx/hash.h"
#include "wx/module.h"
#endif
#include "wx/imagpcx.h"
#include "wx/wfstream.h"
#include "wx/module.h"
//-----------------------------------------------------------------------------
// wxPCXHandler

2
src/common/imagpng.cpp
View File

@ -30,13 +30,13 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/bitmap.h"
#include "wx/module.h"
#endif
#include "png.h"
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/intl.h"
#include "wx/module.h"
// For memcpy
#include <string.h>

2
src/common/imagtiff.cpp
View File

@ -23,6 +23,7 @@
#include "wx/app.h"
#include "wx/intl.h"
#include "wx/bitmap.h"
#include "wx/module.h"
#endif
extern "C"
@ -32,7 +33,6 @@ extern "C"
}
#include "wx/filefn.h"
#include "wx/wfstream.h"
#include "wx/module.h"
#ifndef TIFFLINKAGEMODE
#if defined(__WATCOMC__) && defined(__WXMGL__)

2
src/common/init.cpp
View File

@ -29,12 +29,12 @@
#include "wx/log.h"
#include "wx/thread.h"
#include "wx/intl.h"
#include "wx/module.h"
#endif
#include "wx/init.h"
#include "wx/ptr_scpd.h"
#include "wx/module.h"
#include "wx/except.h"
#if defined(__WXMSW__) && defined(__WXDEBUG__)

2
src/common/intl.cpp
View File

@ -47,6 +47,7 @@
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/hashmap.h"
#include "wx/module.h"
#endif // WX_PRECOMP
#ifndef __WXWINCE__
@ -69,7 +70,6 @@
#include "wx/file.h"
#include "wx/filename.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
#include "wx/fontmap.h"
#include "wx/encconv.h"
#include "wx/ptr_scpd.h"

2
src/common/mimecmn.cpp
View File

@ -34,9 +34,9 @@
#include "wx/string.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/module.h"
#include "wx/file.h"
#include "wx/iconloc.h"
#include "wx/confbase.h"

2
src/common/paper.cpp
View File

@ -23,10 +23,10 @@
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/module.h"
#endif
#include "wx/paper.h"
#include "wx/module.h"
#include <stdlib.h>
#include <string.h>

2
src/common/prntbase.cpp
View File

@ -34,12 +34,12 @@
#include "wx/intl.h"
#include "wx/textdlg.h"
#include "wx/sizer.h"
#include "wx/module.h"
#endif // !WX_PRECOMP
#include "wx/prntbase.h"
#include "wx/printdlg.h"
#include "wx/print.h"
#include "wx/module.h"
#include <stdlib.h>
#include <string.h>

13
src/common/protocol.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: protocol.cpp
// Name: src/common/protocol.cpp
// Purpose: Implement protocol base class
// Author: Guilhem Lavaux
// Modified by:
@ -13,14 +13,18 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_PROTOCOL
#include "wx/protocol/protocol.h"
#ifndef WX_PRECOMP
#include "wx/module.h"
#endif
#include "wx/url.h"
#include "wx/module.h"
#include <stdlib.h>
@ -198,7 +202,7 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
*ret = 0;
result = wxString::FromAscii( tmp_str );
result = result.Left(result.Length()-1);
result = result.Left(result.length()-1);
size = ret-tmp_str+1;
sock->Unread(&tmp_buf[size], avail-size);
@ -209,4 +213,3 @@ wxProtocolError GetLine(wxSocketBase *sock, wxString& result)
#endif // wxUSE_SOCKETS
#endif // wxUSE_PROTOCOL

2
src/common/sckipc.cpp
View File

@ -36,6 +36,7 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/event.h"
#include "wx/module.h"
#endif
#include <stdlib.h>
@ -43,7 +44,6 @@
#include <errno.h>
#include "wx/socket.h"
#include "wx/module.h"
// --------------------------------------------------------------------------
// macros and constants

2
src/common/socket.cpp
View File

@ -33,10 +33,10 @@
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/timer.h"
#include "wx/module.h"
#endif
#include "wx/apptrait.h"
#include "wx/module.h"
#include "wx/sckaddr.h"
#include "wx/datetime.h"

3
src/common/url.cpp
View File

@ -24,10 +24,9 @@
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include <string.h>
#include <ctype.h>

2
src/generic/dirctrlg.cpp
View File

@ -37,9 +37,9 @@
#include "wx/textdlg.h"
#include "wx/gdicmn.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/filefn.h"
#include "wx/imaglist.h"
#include "wx/tokenzr.h"

2
src/generic/renderg.cpp
View File

@ -31,11 +31,11 @@
#include "wx/dc.h"
#include "wx/settings.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/splitter.h"
#include "wx/dcmirror.h"
#include "wx/module.h"
// ----------------------------------------------------------------------------
// wxRendererGeneric: our wxRendererNative implementation

3
src/generic/timer.cpp
View File

@ -26,10 +26,9 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
// ----------------------------------------------------------------------------
// Time input function
// ----------------------------------------------------------------------------

10
src/gtk/artgtk.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: artstd.cpp
// Name: src/gtk/artstd.cpp
// Purpose: stock wxArtProvider instance with native GTK+ stock icons
// Author: Vaclav Slavik
// Modified by:
@ -23,7 +23,11 @@
#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
#include "wx/artprov.h"
#include "wx/module.h"
#ifndef WX_PRECOMP
#include "wx/module.h"
#endif
#include "wx/gtk/private.h"
#include <gtk/gtk.h>
@ -175,7 +179,7 @@ static GtkIconSize FindClosestIconSize(const wxSize& size)
if (size.x > s_sizes[i].x || size.y > s_sizes[i].y)
continue;
unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) +
unsigned dist = (size.x - s_sizes[i].x) * (size.x - s_sizes[i].x) +
(size.y - s_sizes[i].y) * (size.y - s_sizes[i].y);
if (dist == 0)
return s_sizes[i].icon;

2
src/gtk/dcclient.cpp
View File

@ -22,9 +22,9 @@
#include "wx/dcmemory.h"
#include "wx/math.h" // for floating-point functions
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/fontutil.h"
#include "wx/gtk/win_gtk.h"

3
src/gtk/glcanvas.cpp
View File

@ -20,10 +20,9 @@
#include "wx/app.h"
#include "wx/frame.h"
#include "wx/colour.h"
#include "wx/module.h"
#endif // WX_PRECOMP
#include "wx/module.h"
extern "C"
{
#include "gtk/gtk.h"

2
src/gtk/gnome/gprint.cpp
View File

@ -25,11 +25,11 @@
#include "wx/icon.h"
#include "wx/math.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/fontutil.h"
#include "wx/gtk/private.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#include <libgnomeprint/gnome-print.h>

2
src/gtk/gnome/gvfs.cpp
View File

@ -21,11 +21,11 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/mimetype.h"
#include "wx/gtk/private.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#include <libgnomevfs/gnome-vfs-mime-handlers.h>

14
src/gtk/threadno.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/gtk/thread.cpp
// Name: src/gtk/threadno.cpp
// Purpose: Solaris thread support
// Author: Guilhem Lavaux
// Modified by:
@ -16,10 +16,10 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/wx.h"
#include "wx/module.h"
wxMutex::wxMutex()
{
@ -69,7 +69,7 @@ void wxCondition::Wait(wxMutex& WXUNUSED(mutex))
bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
unsigned long WXUNUSED(nsec))
{
return FALSE;
return false;
}
void wxCondition::Signal()
@ -128,17 +128,17 @@ unsigned long wxThread::GetID() const
bool wxThread::IsMain()
{
return TRUE;
return true;
}
bool wxThread::IsRunning() const
{
return FALSE;
return false;
}
bool wxThread::IsAlive() const
{
return FALSE;
return false;
}
void wxThread::SetPriority(int WXUNUSED(prio)) { }
@ -170,7 +170,7 @@ bool wxThreadModule::OnInit()
{
wxMainMutex = new wxMutex();
wxMainMutex->Lock();
return TRUE;
return true;
}
void wxThreadModule::OnExit()

2
src/gtk/threadsgi.cpp
View File

@ -17,6 +17,7 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#include <stdio.h>
@ -25,7 +26,6 @@
#include <signal.h>
#include <sys/wait.h>
#include <sys/prctl.h>
#include "wx/module.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"

14
src/gtk/window.cpp
View File

@ -33,10 +33,9 @@
#include "wx/layout.h"
#include "wx/statusbr.h"
#include "wx/math.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
@ -2359,7 +2358,7 @@ void wxWindowGTK::Init()
m_hasVMT = false;
m_needParent = true;
m_isBeingDeleted = false;
m_showOnIdle= false;
m_noExpose = false;
@ -2878,7 +2877,7 @@ bool wxWindowGTK::GtkShowFromOnIdle()
m_showOnIdle = false;
return true;
}
return false;
}
@ -2900,7 +2899,7 @@ void wxWindowGTK::OnInternalIdle()
SetBackgroundStyle(GetBackgroundStyle());
m_needsStyleChange = false;
}
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
@ -3381,7 +3380,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
m_showOnIdle = true;
gtk_widget_hide( m_widget );
}
/* insert GTK representation */
(*(newParent->m_insertCallback))(newParent, this);
}
@ -3643,7 +3642,7 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect )
if (m_wxwindow)
{
if (!GTK_PIZZA(m_wxwindow)->bin_window) return;
GdkRectangle gdk_rect,
*p;
if (rect)
@ -4316,4 +4315,3 @@ void wxRemoveGrab(wxWindow* window)
{
gtk_grab_remove( (GtkWidget*) window->GetHandle() );
}

2
src/gtk1/app.cpp
View File

@ -29,11 +29,11 @@
#include "wx/font.h"
#include "wx/gdicmn.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/file.h"
#include "wx/filename.h"
#include "wx/module.h"
#include "wx/thread.h"
#ifdef __WXGPE__

2
src/gtk1/dcclient.cpp
View File

@ -21,9 +21,9 @@
#include "wx/dcmemory.h"
#include "wx/math.h" // for floating-point functions
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/fontutil.h"
#include "wx/gtk1/win_gtk.h"

3
src/gtk1/glcanvas.cpp
View File

@ -20,10 +20,9 @@
#include "wx/app.h"
#include "wx/frame.h"
#include "wx/colour.h"
#include "wx/module.h"
#endif // WX_PRECOMP
#include "wx/module.h"
extern "C"
{
#include "gtk/gtk.h"

15
src/gtk1/threadno.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/gtk1/thread.cpp
// Name: src/gtk1/threadno.cpp
// Purpose: Solaris thread support
// Author: Guilhem Lavaux
// Modified by:
@ -17,10 +17,9 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
wxMutex::wxMutex()
{
m_locked = 0;
@ -69,7 +68,7 @@ void wxCondition::Wait(wxMutex& WXUNUSED(mutex))
bool wxCondition::Wait(wxMutex& WXUNUSED(mutex), unsigned long WXUNUSED(sec),
unsigned long WXUNUSED(nsec))
{
return FALSE;
return false;
}
void wxCondition::Signal()
@ -128,17 +127,17 @@ unsigned long wxThread::GetID() const
bool wxThread::IsMain()
{
return TRUE;
return true;
}
bool wxThread::IsRunning() const
{
return FALSE;
return false;
}
bool wxThread::IsAlive() const
{
return FALSE;
return false;
}
void wxThread::SetPriority(int WXUNUSED(prio)) { }
@ -170,7 +169,7 @@ bool wxThreadModule::OnInit()
{
wxMainMutex = new wxMutex();
wxMainMutex->Lock();
return TRUE;
return true;
}
void wxThreadModule::OnExit()

2
src/gtk1/threadsgi.cpp
View File

@ -17,6 +17,7 @@
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#include <stdio.h>
@ -25,7 +26,6 @@
#include <signal.h>
#include <sys/wait.h>
#include <sys/prctl.h>
#include "wx/module.h"
#include "gdk/gdk.h"
#include "gtk/gtk.h"

3
src/gtk1/window.cpp
View File

@ -32,10 +32,9 @@
#include "wx/layout.h"
#include "wx/statusbr.h"
#include "wx/math.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif

14
src/html/chm.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: chm.cpp
// Name: src/html/chm.cpp
// Purpose: CHM (Help) support for wxHTML
// Author: Markus Sinner
// Copyright: (c) 2003 Herd Software Development
@ -10,7 +10,7 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_LIBMSPACK
@ -18,11 +18,11 @@
#include <mspack.h>
#ifndef WXPRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/filesys.h"
#include "wx/mstream.h"
#include "wx/wfstream.h"
@ -637,7 +637,7 @@ wxChmInputStream::CreateHHPStream()
wxUint32 lcid = wxUINT32_SWAP_ON_BE( dummy ) ;
wxString msg ;
msg.Printf(_T("Language=0x%X\r\n"),lcid) ;
out->Write(msg.c_str() , msg.Length() ) ;
out->Write(msg.c_str() , msg.length() ) ;
}
break ;
default:
@ -673,7 +673,7 @@ wxChmInputStream::CreateHHPStream()
tmp = "Index File=*.hhk\r\n";
out->Write((const void *) tmp, strlen(tmp));
}
// Now copy the Data from the memory
out->SeekO(0, wxFromEnd);
m_size = out->TellO();

2
src/html/htmlcell.cpp
View File

@ -21,11 +21,11 @@
#include "wx/colour.h"
#include "wx/dc.h"
#include "wx/settings.h"
#include "wx/module.h"
#endif
#include "wx/html/htmlcell.h"
#include "wx/html/htmlwin.h"
#include "wx/module.h"
#include <stdlib.h>

2
src/html/htmprint.cpp
View File

@ -23,6 +23,7 @@
#include "wx/dc.h"
#include "wx/settings.h"
#include "wx/msgdlg.h"
#include "wx/module.h"
#endif
#include "wx/print.h"
@ -30,7 +31,6 @@
#include "wx/html/htmprint.h"
#include "wx/wxhtml.h"
#include "wx/wfstream.h"
#include "wx/module.h"
//--------------------------------------------------------------------------------

8
src/mac/carbon/app.cpp
View File

@ -32,9 +32,9 @@
#include "wx/textctrl.h"
#include "wx/memory.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/tooltip.h"
#include "wx/docview.h"
#include "wx/filename.h"
@ -45,9 +45,9 @@
// mac
#ifndef __DARWIN__
#if __option(profile)
#include <profiler.h>
#endif
#if __option(profile)
#include <profiler.h>
#endif
#endif
// #include "apprsrc.h"

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

@ -28,10 +28,10 @@
#include "wx/app.h"
#include "wx/utils.h"
#include "wx/timer.h"
#include "wx/module.h"
#endif
#include "wx/apptrait.h"
#include "wx/module.h"
#include "wx/sckaddr.h"
#include "wx/mac/carbon/private.h"

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

@ -15,9 +15,9 @@
#ifndef WX_PRECOMP
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/link.h"
#include "wx/mac/private.h"

182
src/mac/carbon/mpthread.cpp
View File

@ -25,9 +25,9 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/thread.h"
#ifdef __WXMAC__
@ -216,11 +216,11 @@ wxMutexError wxMutexInternal::TryLock()
wxMutexError wxMutexInternal::Unlock()
{
wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
OSStatus err = MPSignalSemaphore( m_semaphore);
if ( err)
OSStatus err = MPSignalSemaphore( m_semaphore);
if ( err)
{
wxLogSysError(_("Could not unlock mutex"));
return wxMUTEX_MISC_ERROR;
wxLogSysError(_("Could not unlock mutex"));
return wxMUTEX_MISC_ERROR;
}
return wxMUTEX_NO_ERROR;
@ -231,13 +231,13 @@ wxMutexError wxMutexInternal::Unlock()
class wxMutexInternal
{
public:
wxMutexInternal(wxMutexType mutexType) ;
~wxMutexInternal() ;
bool IsOk() const { return m_isOk; }
wxMutexInternal(wxMutexType mutexType) ;
~wxMutexInternal() ;
bool IsOk() const { return m_isOk; }
wxMutexError Lock() ;
wxMutexError TryLock() ;
wxMutexError Unlock();
wxMutexError Lock() ;
wxMutexError TryLock() ;
wxMutexError Unlock();
private:
MPCriticalRegionID m_critRegion ;
bool m_isOk ;
@ -259,17 +259,17 @@ wxMutexInternal::wxMutexInternal(wxMutexType mutexType )
wxMutexInternal::~wxMutexInternal()
{
if ( m_critRegion != kInvalidID )
MPDeleteCriticalRegion( m_critRegion);
MPDeleteCriticalRegion( m_critRegion);
}
wxMutexError wxMutexInternal::Lock()
{
wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
OSStatus err = MPEnterCriticalRegion( m_critRegion, kDurationForever);
if ( err)
OSStatus err = MPEnterCriticalRegion( m_critRegion, kDurationForever);
if ( err)
{
wxLogSysError(wxT("Could not lock mutex"));
return wxMUTEX_MISC_ERROR;
wxLogSysError(wxT("Could not lock mutex"));
return wxMUTEX_MISC_ERROR;
}
return wxMUTEX_NO_ERROR;
@ -278,15 +278,15 @@ wxMutexError wxMutexInternal::Lock()
wxMutexError wxMutexInternal::TryLock()
{
wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
OSStatus err = MPEnterCriticalRegion( m_critRegion, kDurationImmediate);
if ( err)
OSStatus err = MPEnterCriticalRegion( m_critRegion, kDurationImmediate);
if ( err)
{
if ( err == kMPTimeoutErr)
{
return wxMUTEX_BUSY;
}
wxLogSysError(wxT("Could not try lock mutex"));
return wxMUTEX_MISC_ERROR;
if ( err == kMPTimeoutErr)
{
return wxMUTEX_BUSY;
}
wxLogSysError(wxT("Could not try lock mutex"));
return wxMUTEX_MISC_ERROR;
}
return wxMUTEX_NO_ERROR;
@ -295,11 +295,11 @@ wxMutexError wxMutexInternal::TryLock()
wxMutexError wxMutexInternal::Unlock()
{
wxCHECK_MSG( m_isOk , wxMUTEX_MISC_ERROR , wxT("Invalid Mutex") ) ;
OSStatus err = MPExitCriticalRegion( m_critRegion);
if ( err)
OSStatus err = MPExitCriticalRegion( m_critRegion);
if ( err)
{
wxLogSysError(_("Could not unlock mutex"));
return wxMUTEX_MISC_ERROR;
wxLogSysError(_("Could not unlock mutex"));
return wxMUTEX_MISC_ERROR;
}
return wxMUTEX_NO_ERROR;
@ -314,23 +314,23 @@ wxMutexError wxMutexInternal::Unlock()
class wxSemaphoreInternal
{
public:
wxSemaphoreInternal(int initialcount, int maxcount);
~wxSemaphoreInternal();
wxSemaphoreInternal(int initialcount, int maxcount);
~wxSemaphoreInternal();
bool IsOk() const { return m_isOk; }
bool IsOk() const { return m_isOk; }
wxSemaError WaitTimeout(unsigned long milliseconds);
wxSemaError WaitTimeout(unsigned long milliseconds);
wxSemaError Wait() { return WaitTimeout( kDurationForever); }
wxSemaError Wait() { return WaitTimeout( kDurationForever); }
wxSemaError TryWait()
{
wxSemaError err = WaitTimeout(kDurationImmediate);
if ( err == wxSEMA_TIMEOUT )
err = wxSEMA_BUSY ;
return err ;
}
wxSemaError Post();
wxSemaError TryWait()
{
wxSemaError err = WaitTimeout(kDurationImmediate);
if ( err == wxSEMA_TIMEOUT )
err = wxSEMA_BUSY ;
return err ;
}
wxSemaError Post();
private:
MPSemaphoreID m_semaphore;
@ -342,12 +342,12 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
wxMacMPThreadsInitVerify() ;
m_isOk = false ;
m_semaphore = kInvalidID ;
if ( maxcount == 0 )
if ( maxcount == 0 )
{
// make it practically infinite
maxcount = INT_MAX;
// make it practically infinite
maxcount = INT_MAX;
}
verify_noerr( MPCreateSemaphore( maxcount, initialcount, & m_semaphore) );
verify_noerr( MPCreateSemaphore( maxcount, initialcount, & m_semaphore) );
m_isOk = ( m_semaphore != kInvalidID ) ;
if ( !IsOk() )
@ -357,31 +357,31 @@ wxSemaphoreInternal::wxSemaphoreInternal(int initialcount, int maxcount)
wxSemaphoreInternal::~wxSemaphoreInternal()
{
if( m_semaphore != kInvalidID )
MPDeleteSemaphore( m_semaphore);
MPDeleteSemaphore( m_semaphore);
}
wxSemaError wxSemaphoreInternal::WaitTimeout(unsigned long milliseconds)
{
OSStatus err = MPWaitOnSemaphore( m_semaphore, milliseconds);
if ( err)
OSStatus err = MPWaitOnSemaphore( m_semaphore, milliseconds);
if ( err)
{
if ( err == kMPTimeoutErr)
{
return wxSEMA_TIMEOUT;
}
return wxSEMA_MISC_ERROR;
if ( err == kMPTimeoutErr)
{
return wxSEMA_TIMEOUT;
}
return wxSEMA_MISC_ERROR;
}
return wxSEMA_NO_ERROR;
return wxSEMA_NO_ERROR;
}
wxSemaError wxSemaphoreInternal::Post()
{
OSStatus err = MPSignalSemaphore( m_semaphore);
if ( err)
OSStatus err = MPSignalSemaphore( m_semaphore);
if ( err)
{
return wxSEMA_MISC_ERROR;
return wxSEMA_MISC_ERROR;
}
return wxSEMA_NO_ERROR;
return wxSEMA_NO_ERROR;
}
// ----------------------------------------------------------------------------
@ -394,50 +394,50 @@ class wxConditionInternal
{
public:
wxConditionInternal(wxMutex& mutex)
wxConditionInternal(wxMutex& mutex)
: m_mutex( mutex),
m_semaphore( 0, 1),
m_gate( 1, 1)
{
m_waiters = 0;
m_signals = 0;
m_canceled = 0;
}
m_semaphore( 0, 1),
m_gate( 1, 1)
{
m_waiters = 0;
m_signals = 0;
m_canceled = 0;
}
~wxConditionInternal()
{
}
~wxConditionInternal()
{
}
bool IsOk() const { return m_mutex.IsOk() ; }
bool IsOk() const { return m_mutex.IsOk() ; }
wxCondError Wait()
{
return WaitTimeout( kDurationForever);
}
wxCondError Wait()
{
return WaitTimeout( kDurationForever);
}
wxCondError WaitTimeout(unsigned long msectimeout);
wxCondError WaitTimeout(unsigned long msectimeout);
wxCondError Signal()
{
return DoSignal( false);
}
wxCondError Signal()
{
return DoSignal( false);
}
wxCondError Broadcast()
{
return DoSignal( true);
}
wxCondError Broadcast()
{
return DoSignal( true);
}
private:
wxCondError DoSignal( bool signalAll);
wxCondError DoSignal( bool signalAll);
wxMutex& m_mutex;
wxSemaphoreInternal m_semaphore; // Signals the waiting threads.
wxSemaphoreInternal m_gate;
wxCriticalSection m_varSection;
size_t m_waiters; // Number of threads waiting for a signal.
size_t m_signals; // Number of signals to send.
size_t m_canceled; // Number of canceled waiters in m_waiters.
wxMutex& m_mutex;
wxSemaphoreInternal m_semaphore; // Signals the waiting threads.
wxSemaphoreInternal m_gate;
wxCriticalSection m_varSection;
size_t m_waiters; // Number of threads waiting for a signal.
size_t m_signals; // Number of signals to send.
size_t m_canceled; // Number of canceled waiters in m_waiters.
};

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

@ -18,11 +18,11 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/module.h"
#endif
#if wxUSE_THREADS
#include "wx/module.h"
#include "wx/thread.h"
#ifdef __WXMAC__

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

@ -36,9 +36,9 @@
#include "wx/textctrl.h"
#include "wx/memory.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/tooltip.h"
#include "wx/docview.h"
#include "wx/filename.h"
@ -48,9 +48,9 @@
// mac
#ifndef __DARWIN__
#if __option(profile)
#include <profiler.h>
#endif
#if __option(profile)
#include <profiler.h>
#endif
#endif
#include "apprsrc.h"

34
src/mac/classic/thread.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: thread.cpp
// Name: src/mac/classic/thread.cpp
// Purpose: wxThread Implementation
// Author: Original from Wolfram Gloger/Guilhem Lavaux/Vadim Zeitlin
// Modified by: Stefan Csomor
@ -23,11 +23,11 @@
#ifndef WX_PRECOMP
#include "wx/wx.h"
#include "wx/module.h"
#endif
#if wxUSE_THREADS
#include "wx/module.h"
#include "wx/thread.h"
#ifdef __WXMAC__
@ -60,7 +60,7 @@ enum wxThreadState
// ----------------------------------------------------------------------------
static ThreadID gs_idMainThread = kNoThreadID ;
static bool gs_waitingForThread = FALSE ;
static bool gs_waitingForThread = false ;
size_t g_numberOfThreads = 0;
// ============================================================================
@ -433,7 +433,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
if ( err != noErr )
{
wxLogSysError(_("Can't create thread"));
return FALSE;
return false;
}
if ( m_priority != WXTHREAD_DEFAULT_PRIORITY )
@ -443,7 +443,7 @@ bool wxThreadInternal::Create(wxThread *thread, unsigned int stackSize)
m_state = STATE_NEW;
return TRUE;
return true;
}
bool wxThreadInternal::Suspend()
@ -458,14 +458,14 @@ bool wxThreadInternal::Suspend()
err = ::ThreadEndCritical() ;
wxASSERT( err == noErr ) ;
wxLogSysError(_("Can not suspend thread %x"), m_tid);
return FALSE;
return false;
}
m_state = STATE_PAUSED;
err = ::SetThreadStateEndCritical(m_tid, kStoppedThreadState, kNoThreadID);
return TRUE;
return true;
}
bool wxThreadInternal::Resume()
@ -485,7 +485,7 @@ bool wxThreadInternal::Resume()
err = ::ThreadEndCritical() ;
wxASSERT( err == noErr ) ;
wxLogSysError(_("Can not resume thread %x"), m_tid);
return FALSE;
return false;
}
err = ::SetThreadStateEndCritical(m_tid, kReadyThreadState, kNoThreadID);
@ -494,7 +494,7 @@ bool wxThreadInternal::Resume()
err = ::ThreadEndCritical() ;
wxASSERT( err == noErr ) ;
::YieldToAnyThread() ;
return TRUE;
return true;
}
// static functions
@ -545,7 +545,7 @@ void wxThread::Sleep(unsigned long milliseconds)
double mssleep = milliseconds * 1000 ;
double msstart, msnow ;
msstart = (start.hi * 4294967296.0 + start.lo) ;
do
{
YieldToAnyThread();
@ -583,7 +583,7 @@ bool wxThread::SetConcurrency(size_t level)
return level == 1;
}
return TRUE ;
return true ;
}
// ctor and dtor
@ -688,7 +688,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
// Delete() is always safe to call, so consider all possible states
// has the thread started to run?
bool shouldResume = FALSE;
bool shouldResume = false;
{
wxCriticalSectionLocker lock(m_critsect);
@ -698,7 +698,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
// WinThreadStart() will see it and terminate immediately
m_internal->SetState(STATE_EXITED);
shouldResume = TRUE;
shouldResume = true;
}
}
@ -712,7 +712,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
if ( IsMain() )
{
// set flag for wxIsWaitingForThread()
gs_waitingForThread = TRUE;
gs_waitingForThread = true;
#if wxUSE_GUI
wxBeginBusyCursor();
@ -742,7 +742,7 @@ wxThreadError wxThread::Delete(ExitCode *pRc)
if ( IsMain() )
{
gs_waitingForThread = FALSE;
gs_waitingForThread = false;
#if wxUSE_GUI
wxEndBusyCursor();
@ -879,13 +879,13 @@ bool wxThreadModule::OnInit()
if ( !hasThreadManager )
{
wxLogSysError( wxT("Thread Support is not available on this System") );
return FALSE ;
return false ;
}
// no error return for GetCurrentThreadId()
MacGetCurrentThread( &gs_idMainThread ) ;
return TRUE;
return true;
}
void wxThreadModule::OnExit()

3
src/mac/corefoundation/hid.cpp
View File

@ -34,12 +34,11 @@
#include "wx/string.h"
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#include "wx/mac/corefoundation/cfstring.h"
#include "wx/module.h"
// ============================================================================
// implementation
// ============================================================================

2
src/mgl/app.cpp
View File

@ -22,10 +22,10 @@
#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/module.h"
#endif
#include "wx/evtloop.h"
#include "wx/module.h"
#include "wx/fontutil.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"

3
src/mgl/cursor.cpp
View File

@ -21,10 +21,9 @@
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/hashmap.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/mgl/private.h"

2
src/mgl/region.cpp
View File

@ -18,10 +18,10 @@
#ifndef WX_PRECOMP
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/thread.h"
#include "wx/module.h"
#include <mgraph.hpp>

3
src/mgl/settings.cpp
View File

@ -19,10 +19,9 @@
#include "wx/colour.h"
#include "wx/font.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
// ----------------------------------------------------------------------------
// global data
// ----------------------------------------------------------------------------

6
src/motif/app.cpp
View File

@ -25,9 +25,9 @@
#include "wx/log.h"
#include "wx/utils.h"
#include "wx/memory.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/evtloop.h"
#if wxUSE_THREADS
@ -35,7 +35,7 @@
#endif
#ifdef __VMS__
#pragma message disable nosimpint
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
@ -43,7 +43,7 @@
#include <X11/Xresource.h>
#include <X11/Xatom.h>
#ifdef __VMS__
#pragma message enable nosimpint
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

7
src/motif/evtloop.cpp
View File

@ -29,17 +29,18 @@
#include "wx/event.h"
#include "wx/app.h"
#include "wx/window.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/evtloop.h"
#ifdef __VMS__
#pragma message disable nosimpint
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
#include <X11/Xlib.h>
#ifdef __VMS__
#pragma message enable nosimpint
#pragma message enable nosimpint
#endif
#include "wx/unix/private.h"
@ -377,8 +378,6 @@ bool wxDoEventLoopIteration( wxEventLoop& evtLoop )
// also wxEventLoop::Exit is implemented that way, so that exiting an
// event loop won't require an event being in the queue
#include "wx/module.h"
#include <sys/types.h>
#include <sys/time.h>
#include <unistd.h>

6
src/motif/window.cpp
View File

@ -40,9 +40,9 @@
#include "wx/scrolwin.h"
#include "wx/layout.h"
#include "wx/menuitem.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/evtloop.h"
#if wxUSE_DRAG_AND_DROP
@ -65,7 +65,7 @@
// 2) call DoMoveWindow from DoSetSize, allowing controls to override it
#ifdef __VMS__
#pragma message disable nosimpint
#pragma message disable nosimpint
#endif
#include <Xm/Xm.h>
@ -76,7 +76,7 @@
#include <Xm/Label.h>
#include <Xm/RowColumn.h> // for XmMenuPosition
#ifdef __VMS__
#pragma message enable nosimpint
#pragma message enable nosimpint
#endif
#include "wx/motif/private.h"

2
src/msw/app.cpp
View File

@ -41,11 +41,11 @@
#include "wx/intl.h"
#include "wx/wxchar.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/apptrait.h"
#include "wx/filename.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/evtloop.h"

3
src/msw/cursor.cpp
View File

@ -34,10 +34,9 @@
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/msw/private.h"
#include "wx/msw/missing.h" // IDC_HAND

2
src/msw/dc.cpp
View File

@ -36,10 +36,10 @@
#include "wx/log.h"
#include "wx/icon.h"
#include "wx/dcprint.h"
#include "wx/module.h"
#endif
#include "wx/sysopt.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#ifdef wxHAVE_RAW_BITMAP

2
src/msw/dde.cpp
View File

@ -30,9 +30,9 @@
#include "wx/utils.h"
#include "wx/app.h"
#include "wx/hashmap.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/dde.h"
#include "wx/intl.h"

2
src/msw/dialup.cpp
View File

@ -34,12 +34,12 @@
#include "wx/event.h"
#include "wx/app.h"
#include "wx/timer.h"
#include "wx/module.h"
#endif
#include "wx/generic/choicdgg.h"
#include "wx/dynlib.h"
#include "wx/module.h"
DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED)
DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED)

5
src/msw/glcanvas.cpp
View File

@ -12,7 +12,7 @@
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_GLCANVAS
@ -23,10 +23,9 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/msw/private.h"
// DLL options compatibility check:

2
src/msw/ownerdrw.cpp
View File

@ -26,11 +26,11 @@
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/menuitem.h"
#include "wx/module.h"
#endif
#include "wx/ownerdrw.h"
#include "wx/fontutil.h"
#include "wx/module.h"
#if wxUSE_OWNER_DRAWN

4
src/msw/settings.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: msw/settings.cpp
// Name: src/msw/settings.cpp
// Purpose: wxSystemSettingsNative implementation for MSW
// Author: Julian Smart
// Modified by:
@ -29,6 +29,7 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/msw/private.h"
@ -37,7 +38,6 @@
#define SPI_GETFLATMENU 0x1022
#endif
#include "wx/module.h"
#include "wx/fontutil.h"
// for SM_CXCURSOR, SM_CYCURSOR, SM_TABLETPC

2
src/msw/textctrl.cpp
View File

@ -36,9 +36,9 @@
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/math.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/sysopt.h"
#if wxUSE_CLIPBOARD

2
src/msw/thread.cpp
View File

@ -28,6 +28,7 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/app.h"
#include "wx/module.h"
#endif
#include "wx/apptrait.h"
@ -38,7 +39,6 @@
#include "wx/msw/seh.h"
#include "wx/except.h"
#include "wx/module.h"
// must have this symbol defined to get _beginthread/_endthread declarations
#ifndef _MT

20
src/msw/toplevel.cpp
View File

@ -34,20 +34,20 @@
#include "wx/intl.h"
#include "wx/frame.h"
#include "wx/containr.h" // wxSetFocusToChild()
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/msw/private.h"
#if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
#include <ole2.h>
#include <shellapi.h>
// Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
#if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
#include <aygshell.h>
#endif
#include "wx/msw/wince/missing.h"
#include <ole2.h>
#include <shellapi.h>
// Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h
#if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__)
#include <aygshell.h>
#endif
#include "wx/msw/wince/missing.h"
#endif
#include "wx/msw/missing.h"
@ -1073,13 +1073,13 @@ bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha)
if ((exstyle & WS_EX_LAYERED) == 0 )
SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED);
return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
}
bool wxTopLevelWindowMSW::CanSetTransparent()
{
// The API is available on win2k and above
static int os_type = -1;
static int ver_major = -1;

2
src/msw/urlmsw.cpp
View File

@ -22,6 +22,7 @@
#include "wx/list.h"
#include "wx/string.h"
#include "wx/utils.h"
#include "wx/module.h"
#endif
#if !wxUSE_PROTOCOL_HTTP
@ -65,7 +66,6 @@ USE_PROTOCOL(wxHTTPDummyProto)
#pragma comment(lib, "wininet.lib")
#endif
#include "wx/module.h"
#include "wx/url.h"
#include <string.h>

2
src/msw/utilsexc.cpp
View File

@ -32,13 +32,13 @@
#if wxUSE_STREAMS
#include "wx/stream.h"
#endif
#include "wx/module.h"
#endif
#include "wx/process.h"
#include "wx/apptrait.h"
#include "wx/module.h"
#include "wx/msw/private.h"

4
src/msw/uxtheme.cpp
View File

@ -31,10 +31,9 @@
#include "wx/toplevel.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/module.h"
#include "wx/msw/uxtheme.h"
// ============================================================================
@ -176,4 +175,3 @@ bool wxUxThemeEngine::Initialize()
}
#endif // wxUSE_UXTHEME

2
src/msw/window.cpp
View File

@ -48,6 +48,7 @@
#include "wx/log.h"
#include "wx/textctrl.h"
#include "wx/menuitem.h"
#include "wx/module.h"
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
@ -55,7 +56,6 @@
#endif
#include "wx/evtloop.h"
#include "wx/module.h"
#include "wx/power.h"
#include "wx/sysopt.h"

3
src/os2/app.cpp
View File

@ -30,13 +30,12 @@
#include "wx/intl.h"
#include "wx/wxchar.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/stdpaths.h"
#include "wx/filename.h"
#include "wx/module.h"
#include "wx/os2/private.h"
#ifdef __EMX__

3
src/os2/dc.cpp
View File

@ -25,10 +25,9 @@
#include "wx/msgdlg.h"
#include "wx/dcprint.h"
#include "wx/statusbr.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include <string.h>
#include "wx/os2/private.h"

2
src/os2/settings.cpp
View File

@ -20,9 +20,9 @@
#include "wx/gdicmn.h"
#include "wx/window.h"
#include "wx/settings.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/os2/private.h"
// the module which is used to clean up wxSystemSettings data (this is a

2
src/os2/thread.cpp
View File

@ -24,10 +24,10 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/app.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/apptrait.h"
#include "wx/module.h"
#include "wx/utils.h"
#include <stdio.h>

2
src/os2/toplevel.cpp
View File

@ -36,9 +36,9 @@
#include "wx/control.h"
#include "wx/containr.h" // wxSetFocusToChild()
#include "wx/settings.h"
#include "wx/module.h" // wxSetFocusToChild()
#endif //WX_PRECOMP
#include "wx/module.h" // wxSetFocusToChild()
#include "wx/os2/private.h"
// ----------------------------------------------------------------------------

2
src/palmos/app.cpp
View File

@ -41,11 +41,11 @@
#include "wx/intl.h"
#include "wx/wxchar.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/apptrait.h"
#include "wx/filename.h"
#include "wx/module.h"
#include "wx/dynlib.h"
#if wxUSE_TOOLTIPS

3
src/palmos/cursor.cpp
View File

@ -34,10 +34,9 @@
#include "wx/settings.h"
#include "wx/intl.h"
#include "wx/image.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
// ----------------------------------------------------------------------------
// private classes
// ----------------------------------------------------------------------------

2
src/palmos/dc.cpp
View File

@ -35,10 +35,10 @@
#include "wx/log.h"
#include "wx/icon.h"
#include "wx/dcprint.h"
#include "wx/module.h"
#endif
#include "wx/sysopt.h"
#include "wx/module.h"
#include "wx/dynload.h"
#ifdef wxHAVE_RAW_BITMAP

2
src/palmos/ownerdrw.cpp
View File

@ -25,11 +25,11 @@
#include "wx/utils.h"
#include "wx/settings.h"
#include "wx/menuitem.h"
#include "wx/module.h"
#endif
#include "wx/ownerdrw.h"
#include "wx/fontutil.h"
#include "wx/module.h"
#if wxUSE_OWNER_DRAWN

2
src/palmos/settings.cpp
View File

@ -29,9 +29,9 @@
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/gdicmn.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#include "wx/fontutil.h"
#include <UIColor.h>

3
src/palmos/textctrl.cpp
View File

@ -36,10 +36,9 @@
#include "wx/log.h"
#include "wx/app.h"
#include "wx/menu.h"
#include "wx/module.h"
#endif
#include "wx/module.h"
#if wxUSE_CLIPBOARD
#include "wx/clipbrd.h"
#endif

11
src/palmos/thread.cpp
View File

@ -20,21 +20,21 @@
#pragma hdrstop
#endif
#if wxUSE_THREADS
#include "wx/thread.h"
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/app.h"
#include "wx/module.h"
#endif
#if wxUSE_THREADS
#include "wx/apptrait.h"
#include "wx/palmos/private.h"
#include "wx/palmos/missing.h"
#include "wx/module.h"
#include "wx/thread.h"
// must have this symbol defined to get _beginthread/_endthread declarations
#ifndef _MT
#define _MT
@ -591,4 +591,3 @@ bool WXDLLIMPEXP_BASE wxIsWaitingForThread()
#include "wx/thrimpl.cpp"
#endif // wxUSE_THREADS

2
src/palmos/toplevel.cpp
View File

@ -38,9 +38,9 @@
#include "wx/checkbox.h"
#include "wx/radiobut.h"
#include "wx/slider.h"
#include "wx/module.h"
#endif //WX_PRECOMP
#include "wx/module.h"
#include "wx/display.h"
// controls for sending select event

3
src/palmos/utilsexc.cpp
View File

@ -32,14 +32,13 @@
#if wxUSE_STREAMS
#include "wx/stream.h"
#endif
#include "wx/module.h"
#endif
#include "wx/process.h"
#include "wx/apptrait.h"
#include "wx/module.h"
#include <ctype.h>
#include <stdio.h>

5
src/palmos/window.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/palmos/windows.cpp
// Name: src/palmos/window.cpp
// Purpose: wxWindow
// Author: William Osborne - minimal working wxPalmOS port
// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality
@ -46,14 +46,13 @@
#include "wx/log.h"
#include "wx/textctrl.h"
#include "wx/menuitem.h"
#include "wx/module.h"
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#include "wx/ownerdrw.h"
#endif
#include "wx/module.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif

2
src/richtext/richtextbuffer.cpp
View File

@ -25,12 +25,12 @@
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/dataobj.h"
#include "wx/module.h"
#endif
#include "wx/filename.h"
#include "wx/clipbrd.h"
#include "wx/wfstream.h"
#include "wx/module.h"
#include "wx/mstream.h"
#include "wx/sstream.h"

4
src/richtext/richtextstyles.cpp
View File

@ -13,7 +13,7 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_RICHTEXT
@ -22,12 +22,12 @@
#ifndef WX_PRECOMP
#include "wx/dcclient.h"
#include "wx/module.h"
#endif
#include "wx/filename.h"
#include "wx/clipbrd.h"
#include "wx/wfstream.h"
#include "wx/module.h"
#include "wx/richtext/richtextctrl.h"

2
src/richtext/richtextxml.cpp
View File

@ -22,13 +22,13 @@
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/module.h"
#endif
#include "wx/filename.h"
#include "wx/clipbrd.h"
#include "wx/wfstream.h"
#include "wx/sstream.h"
#include "wx/module.h"
#include "wx/txtstrm.h"
#include "wx/xml/xml.h"

2
src/unix/fontutil.cpp
View File

@ -32,11 +32,11 @@
#include "wx/encinfo.h"
#include "wx/hash.h"
#include "wx/utils.h" // for wxGetDisplay()
#include "wx/module.h"
#endif // PCH
#include "wx/fontmap.h"
#include "wx/tokenzr.h"
#include "wx/module.h"
#include "wx/fontenum.h"
#if wxUSE_PANGO

6
src/unix/sound.cpp
View File

@ -13,7 +13,7 @@
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
#pragma hdrstop
#pragma hdrstop
#endif
#if wxUSE_SOUND
@ -31,11 +31,11 @@
#include "wx/event.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#endif
#include "wx/thread.h"
#include "wx/file.h"
#include "wx/module.h"
#include "wx/sound.h"
#include "wx/dynlib.h"
@ -640,7 +640,7 @@ bool wxSound::LoadWAV(const wxUint8 *data, size_t length, bool copyData)
// 28 average bytes per second |
// 32 bytes per frame |
// 34 bits per sample |
//
//
// 36 "data"
// 40 number of data bytes
// 44 (wave signal) data

Some files were not shown because too many files have changed in this diff Show More