Support using GetTextExtent() with empty string to get descent in wxOSX.

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

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

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

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -19,7 +23,12 @@ public:
 class wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:
 class wxGUIAppTraits : public wxGUIAppTraitsBase
 {
 public:

-    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);
+#endif // wxUSE_TIMER

 };
 
 #endif // wxUSE_GUI
 };
 
 #endif // wxUSE_GUI