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

[wxWidgets.git] / include / wx / infobar.h

diff --git a/include/wx/infobar.h b/include/wx/infobar.h
index ec02fb33e84231a4b47fac56581bd76bd2dec792..4ae10cb5685cec4b51db0b540eb7839837217cb4 100644 (file)
--- a/include/wx/infobar.h
+++ b/include/wx/infobar.h
@@ -3,7 +3,7 @@
 // Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28
 // Purpose:     declaration of wxInfoBarBase defining common API of wxInfoBar
 // Author:      Vadim Zeitlin
 // Created:     2009-07-28

-// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// RCS-ID:      $Id$

 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -15,13 +15,13 @@
 
 #if wxUSE_INFOBAR
 
 
 #if wxUSE_INFOBAR
 

-#include "wx/window.h"
+#include "wx/control.h"

 
 // ----------------------------------------------------------------------------
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxInfoBarBase : public wxControl
+class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl

 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike
 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike


@@ -36,7 +36,11 @@ public:
     virtual void ShowMessage(const wxString& msg,
                              int flags = wxICON_INFORMATION) = 0;
 
     virtual void ShowMessage(const wxString& msg,
                              int flags = wxICON_INFORMATION) = 0;
 

-    // add an extra button to the bar, near the message
+    // hide the info bar
+    virtual void Dismiss() = 0;
+
+    // add an extra button to the bar, near the message (replacing the default
+    // close button which is only shown if no extra buttons are used)

     virtual void AddButton(wxWindowID btnid,
                            const wxString& label = wxString()) = 0;
 
     virtual void AddButton(wxWindowID btnid,
                            const wxString& label = wxString()) = 0;
 


@@ -48,12 +52,9 @@ private:
 };
 
 // currently only GTK+ has a native implementation
 };
 
 // currently only GTK+ has a native implementation

-#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
-    #include <gtk/gtkversion.h>
-    #if GTK_CHECK_VERSION(2, 18, 0)
-        #include "wx/gtk/infobar.h"
-        #define wxHAS_NATIVE_INFOBAR
-    #endif
+#if defined(__WXGTK218__) && !defined(__WXUNIVERSAL__)
+    #include "wx/gtk/infobar.h"
+    #define wxHAS_NATIVE_INFOBAR

 #endif // wxGTK2
 
 // if the generic version is the only one we have, use it
 #endif // wxGTK2
 
 // if the generic version is the only one we have, use it