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

Source cleaning: whitespaces, tabs, TRUE/true, FALSE/false.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-08 17:30:19 +00:00
parent 35f4bcaf27
commit 4629016dfb
9 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/accel.h
View File

@@ -62,7 +62,7 @@ public:
Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item); Set(entry.m_flags, entry.m_keyCode, entry.m_command, entry.m_item);
return *this; return *this;
} }
void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL) void Set(int flags, int keyCode, int cmd, wxMenuItem *item = NULL)
{ {
m_flags = flags; m_flags = flags;
@@ -94,7 +94,7 @@ public:
// Implementation use only // Implementation use only
bool MatchesEvent(const wxKeyEvent& event) const; bool MatchesEvent(const wxKeyEvent& event) const;
#endif #endif
private: private:
int m_flags; // combination of wxACCEL_XXX constants int m_flags; // combination of wxACCEL_XXX constants
int m_keyCode; // ASCII or virtual keycode int m_keyCode; // ASCII or virtual keycode

2
include/wx/access.h
View File

@@ -51,7 +51,7 @@ typedef enum
// Role constants // Role constants
typedef enum { typedef enum {
wxROLE_NONE, wxROLE_NONE,
wxROLE_SYSTEM_ALERT, wxROLE_SYSTEM_ALERT,
wxROLE_SYSTEM_ANIMATION, wxROLE_SYSTEM_ANIMATION,

28
include/wx/app.h
View File

@@ -173,17 +173,17 @@ public:
// override it!) // override it!)
virtual void OnInitCmdLine(wxCmdLineParser& parser); virtual void OnInitCmdLine(wxCmdLineParser& parser);
// called after successfully parsing the command line, return TRUE // called after successfully parsing the command line, return true
// to continue and FALSE to exit (don't forget to call the base class // to continue and false to exit (don't forget to call the base class
// version if you override it!) // version if you override it!)
virtual bool OnCmdLineParsed(wxCmdLineParser& parser); virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
// called if "--help" option was specified, return TRUE to continue // called if "--help" option was specified, return true to continue
// and FALSE to exit // and false to exit
virtual bool OnCmdLineHelp(wxCmdLineParser& parser); virtual bool OnCmdLineHelp(wxCmdLineParser& parser);
// called if incorrect command line options were given, return // called if incorrect command line options were given, return
// FALSE to abort and TRUE to continue // false to abort and true to continue
virtual bool OnCmdLineError(wxCmdLineParser& parser); virtual bool OnCmdLineError(wxCmdLineParser& parser);
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
@@ -386,7 +386,7 @@ public:
// stop the program immediately!) // stop the program immediately!)
virtual void ExitMainLoop(); virtual void ExitMainLoop();
// returns TRUE if there are unprocessed events in the event queue // returns true if there are unprocessed events in the event queue
virtual bool Pending(); virtual bool Pending();
// process the first event in the event queue (blocks until an event // process the first event in the event queue (blocks until an event
@@ -398,23 +398,23 @@ public:
// process all currently pending events right now // process all currently pending events right now
// //
// it is an error to call Yield() recursively unless the value of // it is an error to call Yield() recursively unless the value of
// onlyIfNeeded is TRUE // onlyIfNeeded is true
// //
// WARNING: this function is dangerous as it can lead to unexpected // WARNING: this function is dangerous as it can lead to unexpected
// reentrancies (i.e. when called from an event handler it // reentrancies (i.e. when called from an event handler it
// may result in calling the same event handler again), use // may result in calling the same event handler again), use
// with _extreme_ care or, better, don't use at all! // with _extreme_ care or, better, don't use at all!
virtual bool Yield(bool onlyIfNeeded = FALSE) = 0; virtual bool Yield(bool onlyIfNeeded = false) = 0;
// this virtual function is called in the GUI mode when the application // this virtual function is called in the GUI mode when the application
// becomes idle and normally just sends wxIdleEvent to all interested // becomes idle and normally just sends wxIdleEvent to all interested
// parties // parties
// //
// it should return TRUE if more idle events are needed, FALSE if not // it should return true if more idle events are needed, false if not
virtual bool ProcessIdle(); virtual bool ProcessIdle();
// Send idle event to window and all subwindows // Send idle event to window and all subwindows
// Returns TRUE if more idle time is requested. // Returns true if more idle time is requested.
virtual bool SendIdleEvents(wxWindow* win, wxIdleEvent& event); virtual bool SendIdleEvents(wxWindow* win, wxIdleEvent& event);
// Perform standard OnIdle behaviour: call from port's OnIdle // Perform standard OnIdle behaviour: call from port's OnIdle
@@ -424,7 +424,7 @@ public:
// top level window functions // top level window functions
// -------------------------- // --------------------------
// return TRUE if our app has focus // return true if our app has focus
virtual bool IsActive() const { return m_isActive; } virtual bool IsActive() const { return m_isActive; }
// set the "main" top level window // set the "main" top level window
@@ -446,7 +446,7 @@ public:
// control the exit behaviour: by default, the program will exit the // control the exit behaviour: by default, the program will exit the
// main loop (and so, usually, terminate) when the last top-level // main loop (and so, usually, terminate) when the last top-level
// program window is deleted. Beware that if you disable this behaviour // program window is deleted. Beware that if you disable this behaviour
// (with SetExitOnFrameDelete(FALSE)), you'll have to call // (with SetExitOnFrameDelete(false)), you'll have to call
// ExitMainLoop() explicitly from somewhere. // ExitMainLoop() explicitly from somewhere.
void SetExitOnFrameDelete(bool flag) void SetExitOnFrameDelete(bool flag)
{ m_exitOnFrameDelete = flag ? Yes : No; } { m_exitOnFrameDelete = flag ? Yes : No; }
@@ -463,7 +463,7 @@ public:
// Set display mode to use. This is only used in framebuffer wxWin // Set display mode to use. This is only used in framebuffer wxWin
// ports (such as wxMGL). This method should be called from // ports (such as wxMGL). This method should be called from
// wxApp::OnInitGui // wxApp::OnInitGui
virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return TRUE; } virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return true; }
// set use of best visual flag (see below) // set use of best visual flag (see below)
void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; } void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; }
@@ -527,7 +527,7 @@ protected:
Yes Yes
} m_exitOnFrameDelete; } m_exitOnFrameDelete;
// TRUE if the apps whats to use the best visual on systems where // true if the apps whats to use the best visual on systems where
// more than one are available (Sun, SGI, XFree86 4.0 ?) // more than one are available (Sun, SGI, XFree86 4.0 ?)
bool m_useBestVisual; bool m_useBestVisual;

6
include/wx/apptrait.h
View File

@@ -109,7 +109,7 @@ public:
#if wxUSE_SOCKETS #if wxUSE_SOCKETS
// return table of GUI callbacks for GSocket code or NULL in wxBase. This // return table of GUI callbacks for GSocket code or NULL in wxBase. This
// is needed because networking classes are in their own library and so // is needed because networking classes are in their own library and so
// they can't directly call GUI functions (the same net library can be // they can't directly call GUI functions (the same net library can be
// used in both GUI and base apps). To complicate it further, GUI library // used in both GUI and base apps). To complicate it further, GUI library
// ("wxCore") doesn't depend on networking library and so only a functions // ("wxCore") doesn't depend on networking library and so only a functions
@@ -225,7 +225,7 @@ public:
#include "wx/mac/apptrait.h" #include "wx/mac/apptrait.h"
#elif defined(__WXPM__) #elif defined(__WXPM__)
#include "wx/os2/apptrait.h" #include "wx/os2/apptrait.h"
#else #else
// at least, we need an implementation of GetToolkitInfo ! // at least, we need an implementation of GetToolkitInfo !
#if wxUSE_GUI #if wxUSE_GUI
class wxGUIAppTraits : public wxGUIAppTraitsBase class wxGUIAppTraits : public wxGUIAppTraitsBase
@@ -233,7 +233,7 @@ public:
virtual wxToolkitInfo& GetToolkitInfo(); virtual wxToolkitInfo& GetToolkitInfo();
}; };
#endif // wxUSE_GUI #endif // wxUSE_GUI
class wxConsoleAppTraits: public wxConsoleAppTraitsBase class wxConsoleAppTraits: public wxConsoleAppTraitsBase
{ {
virtual wxToolkitInfo& GetToolkitInfo(); virtual wxToolkitInfo& GetToolkitInfo();
}; };

4
include/wx/arrstr.h
View File

@@ -27,9 +27,9 @@ typedef wxString _wxArraywxBaseArrayStringBase;
_WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase, _WX_DECLARE_BASEARRAY_2(_wxArraywxBaseArrayStringBase, wxBaseArrayStringBase,
wxArray_SortFunction<wxString>, wxArray_SortFunction<wxString>,
class WXDLLIMPEXP_BASE); class WXDLLIMPEXP_BASE);
WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase, WX_DEFINE_USER_EXPORTED_TYPEARRAY(wxString, wxArrayStringBase,
wxBaseArrayStringBase, WXDLLIMPEXP_BASE); wxBaseArrayStringBase, WXDLLIMPEXP_BASE);
_WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase, _WX_DEFINE_SORTED_TYPEARRAY_2(wxString, wxSortedArrayStringBase,
wxBaseArrayStringBase, = wxStringSortAscending, wxBaseArrayStringBase, = wxStringSortAscending,
class WXDLLIMPEXP_BASE, CMPFUNCwxString); class WXDLLIMPEXP_BASE, CMPFUNCwxString);

80
include/wx/artprov.h
View File

@@ -40,51 +40,51 @@ typedef wxString wxArtID;
// Art clients // Art clients
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define wxART_TOOLBAR wxART_MAKE_CLIENT_ID(wxART_TOOLBAR) #define wxART_TOOLBAR wxART_MAKE_CLIENT_ID(wxART_TOOLBAR)
#define wxART_MENU wxART_MAKE_CLIENT_ID(wxART_MENU) #define wxART_MENU wxART_MAKE_CLIENT_ID(wxART_MENU)
#define wxART_FRAME_ICON wxART_MAKE_CLIENT_ID(wxART_FRAME_ICON) #define wxART_FRAME_ICON wxART_MAKE_CLIENT_ID(wxART_FRAME_ICON)
#define wxART_CMN_DIALOG wxART_MAKE_CLIENT_ID(wxART_CMN_DIALOG) #define wxART_CMN_DIALOG wxART_MAKE_CLIENT_ID(wxART_CMN_DIALOG)
#define wxART_HELP_BROWSER wxART_MAKE_CLIENT_ID(wxART_HELP_BROWSER) #define wxART_HELP_BROWSER wxART_MAKE_CLIENT_ID(wxART_HELP_BROWSER)
#define wxART_MESSAGE_BOX wxART_MAKE_CLIENT_ID(wxART_MESSAGE_BOX) #define wxART_MESSAGE_BOX wxART_MAKE_CLIENT_ID(wxART_MESSAGE_BOX)
#define wxART_BUTTON wxART_MAKE_CLIENT_ID(wxART_BUTTON) #define wxART_BUTTON wxART_MAKE_CLIENT_ID(wxART_BUTTON)
#define wxART_OTHER wxART_MAKE_CLIENT_ID(wxART_OTHER) #define wxART_OTHER wxART_MAKE_CLIENT_ID(wxART_OTHER)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Art IDs // Art IDs
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define wxART_ADD_BOOKMARK wxART_MAKE_ART_ID(wxART_ADD_BOOKMARK) #define wxART_ADD_BOOKMARK wxART_MAKE_ART_ID(wxART_ADD_BOOKMARK)
#define wxART_DEL_BOOKMARK wxART_MAKE_ART_ID(wxART_DEL_BOOKMARK) #define wxART_DEL_BOOKMARK wxART_MAKE_ART_ID(wxART_DEL_BOOKMARK)
#define wxART_HELP_SIDE_PANEL wxART_MAKE_ART_ID(wxART_HELP_SIDE_PANEL) #define wxART_HELP_SIDE_PANEL wxART_MAKE_ART_ID(wxART_HELP_SIDE_PANEL)
#define wxART_HELP_SETTINGS wxART_MAKE_ART_ID(wxART_HELP_SETTINGS) #define wxART_HELP_SETTINGS wxART_MAKE_ART_ID(wxART_HELP_SETTINGS)
#define wxART_HELP_BOOK wxART_MAKE_ART_ID(wxART_HELP_BOOK) #define wxART_HELP_BOOK wxART_MAKE_ART_ID(wxART_HELP_BOOK)
#define wxART_HELP_FOLDER wxART_MAKE_ART_ID(wxART_HELP_FOLDER) #define wxART_HELP_FOLDER wxART_MAKE_ART_ID(wxART_HELP_FOLDER)
#define wxART_HELP_PAGE wxART_MAKE_ART_ID(wxART_HELP_PAGE) #define wxART_HELP_PAGE wxART_MAKE_ART_ID(wxART_HELP_PAGE)
#define wxART_GO_BACK wxART_MAKE_ART_ID(wxART_GO_BACK) #define wxART_GO_BACK wxART_MAKE_ART_ID(wxART_GO_BACK)
#define wxART_GO_FORWARD wxART_MAKE_ART_ID(wxART_GO_FORWARD) #define wxART_GO_FORWARD wxART_MAKE_ART_ID(wxART_GO_FORWARD)
#define wxART_GO_UP wxART_MAKE_ART_ID(wxART_GO_UP) #define wxART_GO_UP wxART_MAKE_ART_ID(wxART_GO_UP)
#define wxART_GO_DOWN wxART_MAKE_ART_ID(wxART_GO_DOWN) #define wxART_GO_DOWN wxART_MAKE_ART_ID(wxART_GO_DOWN)
#define wxART_GO_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT) #define wxART_GO_TO_PARENT wxART_MAKE_ART_ID(wxART_GO_TO_PARENT)
#define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME) #define wxART_GO_HOME wxART_MAKE_ART_ID(wxART_GO_HOME)
#define wxART_FILE_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN) #define wxART_FILE_OPEN wxART_MAKE_ART_ID(wxART_FILE_OPEN)
#define wxART_PRINT wxART_MAKE_ART_ID(wxART_PRINT) #define wxART_PRINT wxART_MAKE_ART_ID(wxART_PRINT)
#define wxART_HELP wxART_MAKE_ART_ID(wxART_HELP) #define wxART_HELP wxART_MAKE_ART_ID(wxART_HELP)
#define wxART_TIP wxART_MAKE_ART_ID(wxART_TIP) #define wxART_TIP wxART_MAKE_ART_ID(wxART_TIP)
#define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW) #define wxART_REPORT_VIEW wxART_MAKE_ART_ID(wxART_REPORT_VIEW)
#define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_VIEW) #define wxART_LIST_VIEW wxART_MAKE_ART_ID(wxART_LIST_VIEW)
#define wxART_NEW_DIR wxART_MAKE_ART_ID(wxART_NEW_DIR) #define wxART_NEW_DIR wxART_MAKE_ART_ID(wxART_NEW_DIR)
#define wxART_FOLDER wxART_MAKE_ART_ID(wxART_FOLDER) #define wxART_FOLDER wxART_MAKE_ART_ID(wxART_FOLDER)
#define wxART_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP) #define wxART_GO_DIR_UP wxART_MAKE_ART_ID(wxART_GO_DIR_UP)
#define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE) #define wxART_EXECUTABLE_FILE wxART_MAKE_ART_ID(wxART_EXECUTABLE_FILE)
#define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE) #define wxART_NORMAL_FILE wxART_MAKE_ART_ID(wxART_NORMAL_FILE)
#define wxART_TICK_MARK wxART_MAKE_ART_ID(wxART_TICK_MARK) #define wxART_TICK_MARK wxART_MAKE_ART_ID(wxART_TICK_MARK)
#define wxART_CROSS_MARK wxART_MAKE_ART_ID(wxART_CROSS_MARK) #define wxART_CROSS_MARK wxART_MAKE_ART_ID(wxART_CROSS_MARK)
#define wxART_ERROR wxART_MAKE_ART_ID(wxART_ERROR) #define wxART_ERROR wxART_MAKE_ART_ID(wxART_ERROR)
#define wxART_QUESTION wxART_MAKE_ART_ID(wxART_QUESTION) #define wxART_QUESTION wxART_MAKE_ART_ID(wxART_QUESTION)
#define wxART_WARNING wxART_MAKE_ART_ID(wxART_WARNING) #define wxART_WARNING wxART_MAKE_ART_ID(wxART_WARNING)
#define wxART_INFORMATION wxART_MAKE_ART_ID(wxART_INFORMATION) #define wxART_INFORMATION wxART_MAKE_ART_ID(wxART_INFORMATION)
#define wxART_MISSING_IMAGE wxART_MAKE_ART_ID(wxART_MISSING_IMAGE) #define wxART_MISSING_IMAGE wxART_MAKE_ART_ID(wxART_MISSING_IMAGE)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -103,10 +103,10 @@ public:
// Remove provider. The provider must have been added previously! // Remove provider. The provider must have been added previously!
// The provider is _not_ deleted. // The provider is _not_ deleted.
static bool RemoveProvider(wxArtProvider *provider); static bool RemoveProvider(wxArtProvider *provider);
// Query the providers for bitmap with given ID and return it. Return // Query the providers for bitmap with given ID and return it. Return
// wxNullBitmap if no provider provides it. // wxNullBitmap if no provider provides it.
static wxBitmap GetBitmap(const wxArtID& id, static wxBitmap GetBitmap(const wxArtID& id,
const wxArtClient& client = wxART_OTHER, const wxArtClient& client = wxART_OTHER,
const wxSize& size = wxDefaultSize); const wxSize& size = wxDefaultSize);
@@ -125,7 +125,7 @@ protected:
// Destroy caches & all providers // Destroy caches & all providers
static void CleanUpProviders(); static void CleanUpProviders();
// Derived classes must override this method to create requested // Derived classes must override this method to create requested
// art resource. This method is called only once per instance's // art resource. This method is called only once per instance's
// lifetime for each requested wxArtID. // lifetime for each requested wxArtID.
virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id), virtual wxBitmap CreateBitmap(const wxArtID& WXUNUSED(id),

28
src/common/appbase.cpp
View File

@@ -128,14 +128,14 @@ wxAppConsole::~wxAppConsole()
bool wxAppConsole::Initialize(int& argc, wxChar **argv) bool wxAppConsole::Initialize(int& argc, wxChar **argv)
{ {
#if wxUSE_LOG #if wxUSE_LOG
// If some code logged something before wxApp instance was created, // If some code logged something before wxApp instance was created,
// wxLogStderr was set as the target. Undo it here by destroying the // wxLogStderr was set as the target. Undo it here by destroying the
// current target. It will be re-created next time logging is needed, but // current target. It will be re-created next time logging is needed, but
// this time wxAppTraits will be used: // this time wxAppTraits will be used:
delete wxLog::SetActiveTarget(NULL); delete wxLog::SetActiveTarget(NULL);
#endif // wxUSE_LOG #endif // wxUSE_LOG
// remember the command line arguments // remember the command line arguments
this->argc = argc; this->argc = argc;
this->argv = argv; this->argv = argv;
@@ -165,7 +165,7 @@ bool wxAppConsole::OnInit()
OnInitCmdLine(parser); OnInitCmdLine(parser);
bool cont; bool cont;
switch ( parser.Parse(FALSE /* don't show usage */) ) switch ( parser.Parse(false /* don't show usage */) )
{ {
case -1: case -1:
cont = OnCmdLineHelp(parser); cont = OnCmdLineHelp(parser);
@@ -181,10 +181,10 @@ bool wxAppConsole::OnInit()
} }
if ( !cont ) if ( !cont )
return FALSE; return false;
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
return TRUE; return true;
} }
int wxAppConsole::OnExit() int wxAppConsole::OnExit()
@@ -383,14 +383,14 @@ bool wxAppConsole::OnCmdLineHelp(wxCmdLineParser& parser)
{ {
parser.Usage(); parser.Usage();
return FALSE; return false;
} }
bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser) bool wxAppConsole::OnCmdLineError(wxCmdLineParser& parser)
{ {
parser.Usage(); parser.Usage();
return FALSE; return false;
} }
#endif // wxUSE_CMDLINE_PARSER #endif // wxUSE_CMDLINE_PARSER
@@ -421,11 +421,11 @@ bool wxAppConsole::CheckBuildOptions(const char *optionsSignature,
wxLogFatalError(msg.c_str()); wxLogFatalError(msg.c_str());
// normally wxLogFatalError doesn't return // normally wxLogFatalError doesn't return
return FALSE; return false;
} }
#undef wxCMP #undef wxCMP
return TRUE; return true;
} }
#ifdef __WXDEBUG__ #ifdef __WXDEBUG__
@@ -589,19 +589,19 @@ void wxOnAssert(const wxChar *szFile,
const wxChar *szMsg) const wxChar *szMsg)
{ {
// FIXME MT-unsafe // FIXME MT-unsafe
static bool s_bInAssert = FALSE; static bool s_bInAssert = false;
if ( s_bInAssert ) if ( s_bInAssert )
{ {
// He-e-e-e-elp!! we're trapped in endless loop // He-e-e-e-elp!! we're trapped in endless loop
wxTrap(); wxTrap();
s_bInAssert = FALSE; s_bInAssert = false;
return; return;
} }
s_bInAssert = TRUE; s_bInAssert = true;
if ( !wxTheApp ) if ( !wxTheApp )
{ {
@@ -615,7 +615,7 @@ void wxOnAssert(const wxChar *szFile,
wxTheApp->OnAssert(szFile, nLine, szCond, szMsg); wxTheApp->OnAssert(szFile, nLine, szCond, szMsg);
} }
s_bInAssert = FALSE; s_bInAssert = false;
} }
#endif // __WXDEBUG__ #endif // __WXDEBUG__
@@ -685,7 +685,7 @@ void ShowAssertDialog(const wxChar *szFile,
wxAppTraits *traits) wxAppTraits *traits)
{ {
// this variable can be set to true to suppress "assert failure" messages // this variable can be set to true to suppress "assert failure" messages
static bool s_bNoAsserts = FALSE; static bool s_bNoAsserts = false;
wxString msg; wxString msg;
msg.reserve(2048); msg.reserve(2048);

34
src/common/appcmn.cpp
View File

@@ -78,8 +78,8 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
wxAppBase::wxAppBase() wxAppBase::wxAppBase()
{ {
m_topWindow = (wxWindow *)NULL; m_topWindow = (wxWindow *)NULL;
m_useBestVisual = FALSE; m_useBestVisual = false;
m_isActive = TRUE; m_isActive = true;
#if wxUSE_EVTLOOP_IN_APP #if wxUSE_EVTLOOP_IN_APP
m_mainLoop = NULL; m_mainLoop = NULL;
@@ -91,10 +91,10 @@ wxAppBase::wxAppBase()
// OTOH, if we set it to No initially we'll have to overwrite it with Yes // OTOH, if we set it to No initially we'll have to overwrite it with Yes
// when we enter our OnRun() because we do want the default behaviour from // when we enter our OnRun() because we do want the default behaviour from
// then on. But this would be a problem if the user code calls // then on. But this would be a problem if the user code calls
// SetExitOnFrameDelete(FALSE) from OnInit(). // SetExitOnFrameDelete(false) from OnInit().
// //
// So we use the special "Later" value which is such that // So we use the special "Later" value which is such that
// GetExitOnFrameDelete() returns FALSE for it but which we know we can // GetExitOnFrameDelete() returns false for it but which we know we can
// safely (i.e. without losing the effect of the users SetExitOnFrameDelete // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
// call) overwrite in OnRun() // call) overwrite in OnRun()
m_exitOnFrameDelete = Later; m_exitOnFrameDelete = Later;
@@ -220,7 +220,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
if ( !theme ) if ( !theme )
{ {
wxLogError(_("Unsupported theme '%s'."), themeName.c_str()); wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
return FALSE; return false;
} }
// Delete the defaultly created theme and set the new theme. // Delete the defaultly created theme and set the new theme.
@@ -237,11 +237,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 ) if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
{ {
wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str()); wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
return FALSE; return false;
} }
if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) ) if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
return FALSE; return false;
} }
#endif // __WXMGL__ #endif // __WXMGL__
@@ -311,10 +311,10 @@ bool wxAppBase::OnInitGui()
{ {
#ifdef __WXUNIVERSAL__ #ifdef __WXUNIVERSAL__
if ( !wxTheme::Get() && !wxTheme::CreateDefault() ) if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
return FALSE; return false;
#endif // __WXUNIVERSAL__ #endif // __WXUNIVERSAL__
return TRUE; return true;
} }
int wxAppBase::OnRun() int wxAppBase::OnRun()
@@ -384,34 +384,34 @@ void wxAppBase::DeletePendingObjects()
} }
} }
// Returns TRUE if more time is needed. // Returns true if more time is needed.
bool wxAppBase::ProcessIdle() bool wxAppBase::ProcessIdle()
{ {
wxIdleEvent event; wxIdleEvent event;
bool needMore = FALSE; bool needMore = false;
wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst(); wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
while (node) while (node)
{ {
wxWindow* win = node->GetData(); wxWindow* win = node->GetData();
if (SendIdleEvents(win, event)) if (SendIdleEvents(win, event))
needMore = TRUE; needMore = true;
node = node->GetNext(); node = node->GetNext();
} }
event.SetEventObject(this); event.SetEventObject(this);
(void) ProcessEvent(event); (void) ProcessEvent(event);
if (event.MoreRequested()) if (event.MoreRequested())
needMore = TRUE; needMore = true;
wxUpdateUIEvent::ResetUpdateTime(); wxUpdateUIEvent::ResetUpdateTime();
return needMore; return needMore;
} }
// Send idle event to window and all subwindows // Send idle event to window and all subwindows
bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event) bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
{ {
bool needMore = FALSE; bool needMore = false;
win->OnInternalIdle(); win->OnInternalIdle();
@@ -421,14 +421,14 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
win->GetEventHandler()->ProcessEvent(event); win->GetEventHandler()->ProcessEvent(event);
if (event.MoreRequested()) if (event.MoreRequested())
needMore = TRUE; needMore = true;
} }
wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst(); wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
while ( node ) while ( node )
{ {
wxWindow *child = node->GetData(); wxWindow *child = node->GetData();
if (SendIdleEvents(child, event)) if (SendIdleEvents(child, event))
needMore = TRUE; needMore = true;
node = node->GetNext(); node = node->GetNext();
} }

20
src/common/artprov.cpp
View File

@@ -72,12 +72,12 @@ bool wxArtProviderCache::GetBitmap(const wxString& full_id, wxBitmap* bmp)
wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id); wxArtProviderBitmapsHash::iterator entry = m_bitmapsHash.find(full_id);
if ( entry == m_bitmapsHash.end() ) if ( entry == m_bitmapsHash.end() )
{ {
return FALSE; return false;
} }
else else
{ {
*bmp = entry->second; *bmp = entry->second;
return TRUE; return true;
} }
} }
@@ -119,27 +119,27 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
/*static*/ bool wxArtProvider::PopProvider() /*static*/ bool wxArtProvider::PopProvider()
{ {
wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") ); wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
wxCHECK_MSG( sm_providers->GetCount() > 0, FALSE, _T("wxArtProviders stack is empty") ); wxCHECK_MSG( sm_providers->GetCount() > 0, false, _T("wxArtProviders stack is empty") );
delete sm_providers->GetFirst()->GetData(); delete sm_providers->GetFirst()->GetData();
sm_providers->Erase(sm_providers->GetFirst()); sm_providers->Erase(sm_providers->GetFirst());
sm_cache->Clear(); sm_cache->Clear();
return TRUE; return true;
} }
/*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider) /*static*/ bool wxArtProvider::RemoveProvider(wxArtProvider *provider)
{ {
wxCHECK_MSG( sm_providers, FALSE, _T("no wxArtProvider exists") ); wxCHECK_MSG( sm_providers, false, _T("no wxArtProvider exists") );
if ( sm_providers->DeleteObject(provider) ) if ( sm_providers->DeleteObject(provider) )
{ {
delete provider; delete provider;
sm_cache->Clear(); sm_cache->Clear();
return TRUE; return true;
} }
return FALSE; return false;
} }
/*static*/ void wxArtProvider::CleanUpProviders() /*static*/ void wxArtProvider::CleanUpProviders()
@@ -177,7 +177,7 @@ wxArtProviderCache *wxArtProvider::sm_cache = NULL;
img.Rescale(size.x, size.y); img.Rescale(size.x, size.y);
bmp = wxBitmap(img); bmp = wxBitmap(img);
} }
#endif #endif
break; break;
} }
} }
@@ -211,7 +211,7 @@ public:
{ {
wxArtProvider::InitStdProvider(); wxArtProvider::InitStdProvider();
wxArtProvider::InitNativeProvider(); wxArtProvider::InitNativeProvider();
return TRUE; return true;
} }
void OnExit() void OnExit()
{ {