wxCore build fix.

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

diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 907af319da1894ad077313d4715449e532d0af62..43e2d4ce9dfaa0efa563e8c3d9e40f5c2f765f4b 100644 (file)
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_NOTEBOOK_H_
 #define _WX_UNIV_NOTEBOOK_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univnotebook.h"
-#endif
-
 #include "wx/arrstr.h"
 
 class WXDLLEXPORT wxSpinButton;
@@ -39,14 +35,19 @@ public:
     // ctors and such
     // --------------
 
-    wxNotebook();
+    wxNotebook() { Init(); }
 
     wxNotebook(wxWindow *parent,
                wxWindowID id,
                const wxPoint& pos = wxDefaultPosition,
                const wxSize& size = wxDefaultSize,
                long style = 0,
-               const wxString& name = wxNOTEBOOK_NAME);
+               const wxString& name = wxNotebookNameStr)
+    {
+        Init();
+
+        (void)Create(parent, id, pos, size, style, name);
+    }
 
     // quasi ctor
     bool Create(wxWindow *parent,
@@ -54,7 +55,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxNOTEBOOK_NAME);
+                const wxString& name = wxNotebookNameStr);
 
     // dtor
     virtual ~wxNotebook();
@@ -63,7 +64,7 @@ public:
     // --------------------------------------
 
     virtual int SetSelection(size_t nPage);
-    virtual int GetSelection() const { return m_sel; }
+    virtual int GetSelection() const { return (int) m_sel; }
 
     virtual bool SetPageText(size_t nPage, const wxString& strText);
     virtual wxString GetPageText(size_t nPage) const;
@@ -82,19 +83,19 @@ public:
     virtual bool InsertPage(size_t nPage,
                             wxNotebookPage *pPage,
                             const wxString& strText,
-                            bool bSelect = FALSE,
+                            bool bSelect = false,
                             int imageId = -1);
 
     // style tests
     // -----------
 
-    // return TRUE if all tabs have the same width
+    // return true if all tabs have the same width
     bool FixedSizeTabs() const { return HasFlag(wxNB_FIXEDWIDTH); }
 
     // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
     wxDirection GetTabOrientation() const;
 
-    // return TRUE if the notebook has tabs at the sidesand not at the top (or
+    // return true if the notebook has tabs at the sidesand not at the top (or
     // bottom) as usual
     bool IsVertical() const;
 
@@ -150,7 +151,7 @@ protected:
     void PositionSpinBtn();
 
     // refresh the given tab only
-    void RefreshTab(int page, bool forceSelected = FALSE);
+    void RefreshTab(int page, bool forceSelected = false);
 
     // refresh all tabs
     void RefreshAllTabs();
@@ -175,7 +176,7 @@ protected:
     wxCoord GetTabWidth(int page) const
         { return FixedSizeTabs() ? m_widthMax : m_widths[page]; }
 
-    // return TRUE if the tab has an associated image
+    // return true if the tab has an associated image
     bool HasImage(int page) const
         { return m_imageList && m_images[page] != -1; }