Implemented Chuck Messenger's naming and simplification improvements,

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

diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index d8c772d7a0798068bd3f7e738af4126a682274dc..4b297ddf323b6e5c697da75d4b1aeb4333b7f247 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -29,7 +29,14 @@
 
 class wxImageList;
 class wxNotebook;
 
 class wxImageList;
 class wxNotebook;

-class wxNotebookPage;
+
+typedef wxWindow wxNotebookPage;  // so far, any window can be a page
+
+//-----------------------------------------------------------------------------
+// internal class
+//-----------------------------------------------------------------------------
+
+class wxGtkNotebookPage;

 
 //-----------------------------------------------------------------------------
 // wxNotebook
 
 //-----------------------------------------------------------------------------
 // wxNotebook


@@ -38,26 +45,24 @@ class wxNotebookPage;
 class wxNotebook : public wxControl
 {
 public:
 class wxNotebook : public wxControl
 {
 public:

-  // ctors
-  // -----
-    // default for dynamic class
-  wxNotebook();
-    // the same arguments as for wxControl (@@@ any special styles?)
-  wxNotebook(wxWindow *parent,
+      // default for dynamic class
+    wxNotebook();
+      // the same arguments as for wxControl
+    wxNotebook(wxWindow *parent,

              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");
              wxWindowID id,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxString& name = "notebook");

-    // Create() function
-  bool Create(wxWindow *parent,
+      // Create() function
+    bool Create(wxWindow *parent,

               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
               const wxSize& size = wxDefaultSize,
               long style = 0,
               const wxString& name = "notebook");

-    // dtor
-  ~wxNotebook();
+      // dtor
+    ~wxNotebook();

 
   // accessors
   // ---------
 
   // accessors
   // ---------


@@ -84,6 +89,7 @@ public:
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);
   // 3) set for each page it's image
     // associate image list with a control
   void SetImageList(wxImageList* imageList);

+  void AssignImageList(wxImageList* imageList);

     // get pointer (may be NULL) to the associated image list
   wxImageList *GetImageList() const { return m_imageList; }
 
     // get pointer (may be NULL) to the associated image list
   wxImageList *GetImageList() const { return m_imageList; }
 


@@ -114,46 +120,51 @@ public:
   
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.
   
     // adds a new page to the notebook (it will be deleted ny the notebook,
     // don't delete it yourself). If bSelect, this page becomes active.

-  bool AddPage( wxWindow *win,
-                const wxString& strText,
-                bool select = FALSE,
-                int imageId = -1 );
+    bool AddPage( wxNotebookPage *win,
+                  const wxString& strText,
+                  bool select = FALSE,
+                  int imageId = -1 );

     // the same as AddPage(), but adds it at the specified position
     // the same as AddPage(), but adds it at the specified position

-  bool InsertPage( int position,
-                   wxWindow *win,
-                   const wxString& strText,
-                   bool bSelect = FALSE,
-                   int imageId = -1 );
+    bool InsertPage( int position,
+                     wxNotebookPage *win,
+                     const wxString& strText,
+                     bool bSelect = FALSE,
+                     int imageId = -1 );

 
     // get the panel which represents the given page
 
     // get the panel which represents the given page

-  wxWindow *GetPage(int nPage) const;
+    wxNotebookPage *GetPage(int nPage) const;

 
 

-  void OnNavigationKey(wxNavigationKeyEvent& event);
+    // handler for tab navigation
+    // --------------------------
+    void OnNavigationKey(wxNavigationKeyEvent& event);

 
 

-    // overridden from wxWindow to make tabbing work  
-  void SetFocus();
+    // implementation
+    // --------------

 
 

-  // implementation
+#if wxUSE_CONSTRAINTS
+    void SetConstraintSizes(bool recurse);
+    bool DoPhase(int phase);
+#endif

 
 

-  void SetConstraintSizes(bool recurse);
-  bool DoPhase(int phase);
-  void ApplyWidgetStyle();
+    void ApplyWidgetStyle();

 
 

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

 
 

-  // common part of all ctors
-  void Init();
+    // common part of all ctors
+    void Init();

 
 

-  // helper function
-  wxNotebookPage* GetNotebookPage(int page) const;
+    // helper function
+    wxGtkNotebookPage* GetNotebookPage(int page) const;

 
 

-  wxImageList*    m_imageList;
-  wxList          m_pages;
-  int             m_lastSelection;  /* hack */
+    wxImageList*    m_imageList;
+    bool            m_ownsImageList;
+    wxList          m_pages;
+    int             m_lastSelection;  /* hack */

 
 

-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(wxNotebook)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif