nested iterator classes must be dll-exported

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

diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index 2441d64b3a68b707c55b0c48c59e88aeda5a42f5..9724afdb1175c19e75be8b604d4eae6ad54dbac3 100644 (file)
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -11,15 +11,11 @@
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 
 #ifndef __GTKNOTEBOOKH__
 #define __GTKNOTEBOOKH__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // internal class
 //-----------------------------------------------------------------------------
 

-class wxGtkNotebookPage;
+class WXDLLIMPEXP_CORE wxGtkNotebookPage;

 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 
 #include "wx/list.h"
 WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);


@@ -28,7 +24,7 @@ WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList);
 // wxNotebook
 //-----------------------------------------------------------------------------
 
 // wxNotebook
 //-----------------------------------------------------------------------------
 

-class wxNotebook : public wxNotebookBase
+class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase

 {
 public:
       // default for dynamic class
 {
 public:
       // default for dynamic class


@@ -39,14 +35,14 @@ public:
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,

-             const wxString& name = wxT("notebook"));
+             const wxString& name = wxNotebookNameStr);

       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
       // Create() function
     bool Create(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,

-              const wxString& name = wxT("notebook"));
+              const wxString& name = wxNotebookNameStr);

       // dtor
     virtual ~wxNotebook();
 
       // dtor
     virtual ~wxNotebook();
 


@@ -80,24 +76,26 @@ public:
 
   // operations
   // ----------
 
   // operations
   // ----------

-    // remove one page from the notebook
-  bool DeletePage(size_t nPage);

     // remove all pages
   bool DeleteAllPages();
 
     // remove all pages
   bool DeleteAllPages();
 

-    // adds a new page to the notebook (it will be deleted ny the notebook,
+    // adds a new page to the notebook (it will be deleted by the notebook,

     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     bool InsertPage( size_t position,
                      wxNotebookPage *win,
                      const wxString& strText,
     // don't delete it yourself). If bSelect, this page becomes active.
     // the same as AddPage(), but adds it at the specified position
     bool InsertPage( size_t position,
                      wxNotebookPage *win,
                      const wxString& strText,

-                     bool bSelect = FALSE,
+                     bool bSelect = false,

                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 
                      int imageId = -1 );
 
     // handler for tab navigation
     // --------------------------
     void OnNavigationKey(wxNavigationKeyEvent& event);
 

+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+

     // implementation
     // --------------
 
     // implementation
     // --------------
 


@@ -105,9 +103,6 @@ public:
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
 #endif
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
 #endif

-
-    void ApplyWidgetStyle();
-

     // report if window belongs to notebook
     bool IsOwnGtkWindow( GdkWindow *window );
 
     // report if window belongs to notebook
     bool IsOwnGtkWindow( GdkWindow *window );
 


@@ -124,10 +119,13 @@ public:
     // selection internally instead of querying the notebook for it
     int m_selection;
 
     // selection internally instead of querying the notebook for it
     int m_selection;
 

-    // flag set to TRUE while we're inside "switch_page" callback
+    // flag set to true while we're inside "switch_page" callback

     bool m_inSwitchPage;
 
 protected:
     bool m_inSwitchPage;
 
 protected:

+    // set all page's attributes
+    void DoApplyWidgetStyle(GtkRcStyle *style);
+

     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);
 
     // remove one page from the notebook but do not destroy it
     virtual wxNotebookPage *DoRemovePage(size_t nPage);