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 910605567220a72d932dd07079bd545784a3eaa5..4b297ddf323b6e5c697da75d4b1aeb4333b7f247 100644 (file)
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -89,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; }
 


@@ -140,8 +141,11 @@ public:
     // implementation
     // --------------
 
     // implementation
     // --------------
 

+#if wxUSE_CONSTRAINTS

     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);
     void SetConstraintSizes(bool recurse);
     bool DoPhase(int phase);

+#endif
+

     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  
     void ApplyWidgetStyle();
 
     // report if window belongs to notebook  


@@ -154,6 +158,7 @@ public:
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     wxImageList*    m_imageList;
     wxGtkNotebookPage* GetNotebookPage(int page) const;
 
     wxImageList*    m_imageList;

+    bool            m_ownsImageList;

     wxList          m_pages;
     int             m_lastSelection;  /* hack */
 
     wxList          m_pages;
     int             m_lastSelection;  /* hack */