projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox
[wxWidgets.git]
/
include
/
wx
/
app.h
diff --git
a/include/wx/app.h
b/include/wx/app.h
index 29f9f34c1886d2c76c5a6ab7877acd8ac14e51df..e24b165c2bc3e510b632bc2cd6bc358fbcea70fe 100644
(file)
--- a/
include/wx/app.h
+++ b/
include/wx/app.h
@@
-206,12
+206,12
@@
public:
// user-defined class (default implementation creates a wxLogGui
// object) -- this log object is used by default by all wxLogXXX()
// functions.
// user-defined class (default implementation creates a wxLogGui
// object) -- this log object is used by default by all wxLogXXX()
// functions.
-
virtual wxLog *CreateLogTarget(
);
+
wxDEPRECATED( virtual wxLog *CreateLogTarget()
);
#endif // wxUSE_LOG
// similar to CreateLogTarget() but for the global wxMessageOutput
// object
#endif // wxUSE_LOG
// similar to CreateLogTarget() but for the global wxMessageOutput
// object
-
virtual wxMessageOutput *CreateMessageOutput(
);
+
wxDEPRECATED( virtual wxMessageOutput *CreateMessageOutput()
);
#endif // WXWIN_COMPATIBILITY_2_4
#endif // WXWIN_COMPATIBILITY_2_4
@@
-278,10
+278,7
@@
public:
static bool CheckBuildOptions(const char *optionsSignature,
const char *componentName);
#if WXWIN_COMPATIBILITY_2_4
static bool CheckBuildOptions(const char *optionsSignature,
const char *componentName);
#if WXWIN_COMPATIBILITY_2_4
- static bool CheckBuildOptions(const wxBuildOptions& buildOptions)
- {
- return CheckBuildOptions(buildOptions.m_signature, "your program");
- }
+ wxDEPRECATED( static bool CheckBuildOptions(const wxBuildOptions& buildOptions) );
#endif
// implementation only from now on
#endif
// implementation only from now on
@@
-561,7
+558,9
@@
protected:
// ----------------------------------------------------------------------------
#if wxUSE_GUI
// ----------------------------------------------------------------------------
#if wxUSE_GUI
- #if defined(__WXMSW__)
+ #if defined(__WXPALMOS__)
+ #include "wx/palmos/app.h"
+ #elif defined(__WXMSW__)
#include "wx/msw/app.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/app.h"
#include "wx/msw/app.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/app.h"