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

[wxWidgets.git] / include / wx / univ / notebook.h

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index cf982afe6cd01dfb90353d91a8078e9110323661..bbc4250be93b22ad252dce4559396236db2b7df2 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -130,7 +130,6 @@ protected:
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing
     void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
 
     // resizing

-    virtual wxSize DoGetBestClientSize() const;

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoSetSize(int x, int y,
                            int width, int height,


@@ -188,7 +187,7 @@ protected:
 
     // return true if the tab has an associated image
     bool HasImage(int page) const
 
     // return true if the tab has an associated image
     bool HasImage(int page) const

-        { return m_imageList && m_images[page] != -1; }
+        { return HasImageList() && m_images[page] != -1; }

 
     // get the part of the notebook reserved for the pages (slightly larger
     // than GetPageRect() as we draw a border and leave marginin between)
 
     // get the part of the notebook reserved for the pages (slightly larger
     // than GetPageRect() as we draw a border and leave marginin between)