Return wxFONTFAMILY_DEFAULT, not UNKNOWN, from wxFont::GetFamily().

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

diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h
index a252aa8e7caca1f63a7bf3af0768fada80c1db79..21e6ad3271ce34aeed1a78904cfeae22289f8d38 100644 (file)
--- a/include/wx/cocoa/notebook.h
+++ b/include/wx/cocoa/notebook.h
@@ -6,7 +6,7 @@
 // Created:     2004/04/08
 // RCS-ID:      $Id$
 // Copyright:   (c) 2004 David Elliott
-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_NOTEBOOK_H__
@@ -17,7 +17,7 @@
 // ========================================================================
 // wxNotebook
 // ========================================================================
-class WXDLLEXPORT wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView
+class WXDLLIMPEXP_CORE wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView
 {
     DECLARE_DYNAMIC_CLASS(wxNotebook)
     DECLARE_EVENT_TABLE()
@@ -31,7 +31,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = 0,
-            const wxString& name = wxNOTEBOOK_NAME)
+            const wxString& name = wxNotebookNameStr)
     {
         Create(parent, winid, pos, size, style, name);
     }
@@ -40,7 +40,7 @@ public:
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize,
             long style = 0,
-            const wxString& name = wxNOTEBOOK_NAME);
+            const wxString& name = wxNotebookNameStr);
     virtual ~wxNotebook();
 
 // ------------------------------------------------------------------------
@@ -48,7 +48,7 @@ public:
 // ------------------------------------------------------------------------
 protected:
     // Notebooks cannot be enabled/disabled
-    virtual void CocoaSetEnabled(bool enable) { }
+    virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { }
     virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem);
     virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem);
 // ------------------------------------------------------------------------
@@ -57,11 +57,13 @@ protected:
 public:
     // set the currently selected page, return the index of the previously
     // selected one (or -1 on error)
-    // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
     int SetSelection(size_t nPage);
     // get the currently selected page
     int GetSelection() const;
 
+    // changes selected page without sending events
+    int ChangeSelection(size_t nPage);
+
     // set/get the title of a page
     bool SetPageText(size_t nPage, const wxString& strText);
     wxString GetPageText(size_t nPage) const;
@@ -94,7 +96,7 @@ public:
     bool InsertPage( size_t position,
                      wxNotebookPage *win,
                      const wxString& strText,
-                     bool bSelect = FALSE,
+                     bool bSelect = false,
                      int imageId = -1 );
 
 protected: