removed old xpm code

[wxWidgets.git] / src / gtk / notebook.cpp

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index 3626e86c461a04e89256808e17bb46a43c2d6319..78f0ebc9d6391d9cdace4301a1678c6e5fd3428c 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -26,6 +26,13 @@
 #include "wx/gtk/win_gtk.h"
 #include <gdk/gdkkeysyms.h>
 
 #include "wx/gtk/win_gtk.h"
 #include <gdk/gdkkeysyms.h>
 

+// ----------------------------------------------------------------------------
+// events
+// ----------------------------------------------------------------------------
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
+

 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // idle system
 //-----------------------------------------------------------------------------


@@ -214,8 +221,10 @@ END_EVENT_TABLE()
 void wxNotebook::Init()
 {
     m_imageList = (wxImageList *) NULL;
 void wxNotebook::Init()
 {
     m_imageList = (wxImageList *) NULL;

+    m_ownsImageList = FALSE;

     m_pages.DeleteContents( TRUE );
     m_lastSelection = -1;
     m_pages.DeleteContents( TRUE );
     m_lastSelection = -1;

+    m_themeEnabled = TRUE;

 }
 
 wxNotebook::wxNotebook()
 }
 
 wxNotebook::wxNotebook()


@@ -238,6 +247,7 @@ wxNotebook::~wxNotebook()
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     DeleteAllPages();
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     DeleteAllPages();

+    if (m_ownsImageList) delete m_imageList;

 }
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,


@@ -387,7 +397,15 @@ void wxNotebook::AdvanceSelection( bool forward )
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {

+    if (m_ownsImageList) delete m_imageList;

     m_imageList = imageList;
     m_imageList = imageList;

+    m_ownsImageList = FALSE;
+}
+
+void wxNotebook::AssignImageList( wxImageList* imageList )
+{
+    SetImageList(imageList);
+    m_ownsImageList = TRUE;

 }
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 }
 
 bool wxNotebook::SetPageText( int page, const wxString &text )


@@ -561,6 +579,9 @@ bool wxNotebook::InsertPage( int position, wxNotebookPage* win, const wxString&
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 
     gtk_signal_disconnect_by_func( GTK_OBJECT(m_widget),
       GTK_SIGNAL_FUNC(gtk_notebook_page_change_callback), (gpointer) this );
 

+    if (m_themeEnabled)
+        win->SetThemeEnabled(TRUE);
+

     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
     wxGtkNotebookPage *page = new wxGtkNotebookPage();
     GtkNotebook *notebook = GTK_NOTEBOOK(m_widget);
 
     wxGtkNotebookPage *page = new wxGtkNotebookPage();