added wxTextEntry::SetHint() (a.k.a. cue banner or placeholder string)

[wxWidgets.git] / include / wx / msdos / apptrait.h

diff --git a/include/wx/msdos/apptrait.h b/include/wx/msdos/apptrait.h
index 6790aaec3f5c29397431baa0e49e0eff9c3ab036..b4520eaaeab80e8f44ef10699ad6b4c70023a6d1 100644 (file)
--- a/include/wx/msdos/apptrait.h
+++ b/include/wx/msdos/apptrait.h
@@ -12,7 +12,7 @@
 class wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:
 class wxConsoleAppTraits : public wxConsoleAppTraitsBase
 {
 public:

-    virtual wxEventLoop *CreateEventLoop() { return NULL; }
+    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }

 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *) { return NULL; }
 #endif // wxUSE_TIMER
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *) { return NULL; }
 #endif // wxUSE_TIMER


@@ -23,8 +23,8 @@ public:
 class wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

-    virtual wxEventLoop *CreateEventLoop();
-    virtual wxPortId GetToolkitVersion(int *majVer, int *minVer) const;
+    virtual wxEventLoopBase *CreateEventLoop();
+    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;

 
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
 
 #if wxUSE_TIMER
     virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);