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

[wxWidgets.git] / samples / taskbar / tbtest.h

diff --git a/samples/taskbar/tbtest.h b/samples/taskbar/tbtest.h
index df54f38dcfdd917c14cfbfa08a835e5ff9a0dd44..d667df9186fc8d923a3f431b888ce6509915586f 100644 (file)
--- a/samples/taskbar/tbtest.h
+++ b/samples/taskbar/tbtest.h
@@ -12,8 +12,8 @@
 class MyTaskBarIcon : public wxTaskBarIcon
 {
 public:
 class MyTaskBarIcon : public wxTaskBarIcon
 {
 public:

-#if defined(__WXCOCOA__)
-    MyTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA
+    MyTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE)

     :   wxTaskBarIcon(iconType)
 #else
     MyTaskBarIcon()
     :   wxTaskBarIcon(iconType)
 #else
     MyTaskBarIcon()


@@ -53,7 +53,7 @@ protected:
     void OnCloseWindow(wxCloseEvent& event);
 
     MyTaskBarIcon   *m_taskBarIcon;
     void OnCloseWindow(wxCloseEvent& event);
 
     MyTaskBarIcon   *m_taskBarIcon;

-#if defined(__WXCOCOA__)
+#if defined(__WXOSX__) && wxOSX_USE_COCOA

     MyTaskBarIcon   *m_dockIcon;
 #endif
 
     MyTaskBarIcon   *m_dockIcon;
 #endif