projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rewrote wxFileName::Normalize(), added a few methods, general clean up,
[wxWidgets.git]
/
include
/
wx
/
stubs
/
app.h
diff --git
a/include/wx/stubs/app.h
b/include/wx/stubs/app.h
index 3b1467fec58a94bf6275647b6dbd1b158f644ebd..fba1c3f2416568306bf94aaad9ab8fbd07c62311 100644
(file)
--- a/
include/wx/stubs/app.h
+++ b/
include/wx/stubs/app.h
@@
-32,10
+32,6
@@
class WXDLLEXPORT wxLog;
WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-void WXDLLEXPORT wxCleanUp();
-void WXDLLEXPORT wxCommonCleanUp(); // Call this from the platform's wxCleanUp()
-void WXDLLEXPORT wxCommonInit(); // Call this from the platform's initialization
-
// Force an exit from main loop
void WXDLLEXPORT wxExit();
// Force an exit from main loop
void WXDLLEXPORT wxExit();
@@
-59,7
+55,7
@@
class WXDLLEXPORT wxApp: public wxEvtHandler
virtual bool Pending() ;
virtual void Dispatch() ;
virtual bool Pending() ;
virtual void Dispatch() ;
- v
irtual v
oid OnIdle(wxIdleEvent& event);
+ void OnIdle(wxIdleEvent& event);
// Generic
virtual bool OnInit() { return FALSE; };
// Generic
virtual bool OnInit() { return FALSE; };
@@
-71,6
+67,10
@@
class WXDLLEXPORT wxApp: public wxEvtHandler
virtual int OnRun() { return MainLoop(); };
virtual int OnExit() { return 0; }
virtual int OnRun() { return MainLoop(); };
virtual int OnExit() { return 0; }
+ /** Returns the standard icons for the msg dialogs, implemented in
+ src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
+ virtual wxIcon GetStdIcon(int which) const;
+
inline void SetPrintMode(int mode) { m_printMode = mode; }
inline int GetPrintMode() const { return m_printMode; }
inline void SetPrintMode(int mode) { m_printMode = mode; }
inline int GetPrintMode() const { return m_printMode; }
@@
-132,8
+132,9
@@
protected:
public:
// Implementation
public:
// Implementation
- static void CommonInit();
- static void CommonCleanUp();
+ static bool Initialize();
+ static void CleanUp();
+
void DeletePendingObjects();
bool ProcessIdle();
void DeletePendingObjects();
bool ProcessIdle();