no message

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

diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp
index a2c5f2f9df4071d6862661544ebded6111ba1b12..d9b2bbc0909d8283521b689269e8d5b6132a5f5e 100644 (file)
--- a/src/gtk/notebook.cpp
+++ b/src/gtk/notebook.cpp
@@ -31,10 +31,11 @@ public:
     m_id = -1;
     m_text = "";
     m_image = -1;
     m_id = -1;
     m_text = "";
     m_image = -1;

-    m_page = NULL;
-    m_client = NULL;
-    m_parent = NULL;
-  };
+    m_page = (GtkNotebookPage *) NULL;
+    m_client = (wxWindow *) NULL;
+    m_parent = (GtkNotebook *) NULL;
+    m_box = (GtkWidget *) NULL;
+  }

 
 //private:
   int                m_id;
 
 //private:
   int                m_id;


@@ -44,13 +45,13 @@ public:
   GtkLabel          *m_label;
   wxWindow          *m_client;
   GtkNotebook       *m_parent;
   GtkLabel          *m_label;
   wxWindow          *m_client;
   GtkNotebook       *m_parent;

+  GtkWidget         *m_box;     // in which the label and image are packed

 };
 
 //-----------------------------------------------------------------------------
 };
 
 //-----------------------------------------------------------------------------

-// GTK callbacks
+// "switch_page"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-// page change callback

 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint nPage,
 static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
                                               GtkNotebookPage *WXUNUSED(page),
                                               gint nPage,


@@ -58,21 +59,23 @@ static void gtk_notebook_page_change_callback(GtkNotebook *WXUNUSED(widget),
 {
   wxNotebook *notebook = (wxNotebook *)data;
 
 {
   wxNotebook *notebook = (wxNotebook *)data;
 

-  int nOld = notebook->GetSelection();
+  int old = notebook->GetSelection();

 
   // TODO: emulate PAGE_CHANGING event
 
   // TODO: emulate PAGE_CHANGING event

-  wxNotebookEvent event(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
-                        notebook->GetId(),
-                        nPage,
-                        nOld);
-  event.SetEventObject(notebook);
-  notebook->ProcessEvent(event);
+  
+  wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
+                         notebook->GetId(),  nPage, old );
+  event.SetEventObject( notebook );
+  notebook->GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

+//-----------------------------------------------------------------------------
+// "size_allocate"
+//-----------------------------------------------------------------------------
+

 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {
 static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxWindow *win )
 {

-  if ( win->GetAutoLayout() )
-    win->Layout();
+  if (win->GetAutoLayout()) win->Layout();

 
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&
 
   if ((win->m_x == alloc->x) &&
       (win->m_y == alloc->y) &&


@@ -80,31 +83,10 @@ static void gtk_page_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation*
       (win->m_height == alloc->height))
   {
     return;
       (win->m_height == alloc->height))
   {
     return;

-  };
-
-/*
-  printf( "OnResize from " );
-  if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
-    printf( win->GetClassInfo()->GetClassName() );
-  printf( " .\n" );
-
-  printf( "  Old: X: %d  Y: %d ", win->m_x, win->m_y );
-  printf( "  W: %d  H: %d ", win->m_width, win->m_height );
-  printf( " .\n" );
-
-  printf( "  New: X: %d  Y: %d ", alloc->x, alloc->y );
-  printf( "  W: %d  H: %d ", alloc->width, alloc->height );
-  printf( " .\n" );
-*/
+  }

 
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );
 
   win->SetSize( alloc->x, alloc->y, alloc->width, alloc->height );

-
-/*
-  printf( "  Res: X: %d  Y: %d ", win->m_x, win->m_y );
-  printf( "  W: %d  H: %d ", win->m_width, win->m_height );
-  printf( " .\n" );
-*/
-};
+}

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


@@ -114,7 +96,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxNotebook,wxControl)
 
 void wxNotebook::Init()
 {
 
 void wxNotebook::Init()
 {

-  m_imageList = NULL;
+  m_imageList = (wxImageList *) NULL;

   m_pages.DeleteContents( TRUE );
   m_idHandler = 0;
 }
   m_pages.DeleteContents( TRUE );
   m_idHandler = 0;
 }


@@ -122,7 +104,7 @@ void wxNotebook::Init()
 wxNotebook::wxNotebook()
 {
   Init();
 wxNotebook::wxNotebook()
 {
   Init();

-};
+}

 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
 
 wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,


@@ -130,16 +112,16 @@ wxNotebook::wxNotebook( wxWindow *parent, wxWindowID id,
 {
   Init();
   Create( parent, id, pos, size, style, name );
 {
   Init();
   Create( parent, id, pos, size, style, name );

-};
+}

 
 wxNotebook::~wxNotebook()
 {
   // don't generate change page events any more
 
 wxNotebook::~wxNotebook()
 {
   // don't generate change page events any more

-  if ( m_idHandler != 0 )
+  if (m_idHandler != 0)

     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 
   DeleteAllPages();
     gtk_signal_disconnect(GTK_OBJECT(m_widget), m_idHandler);
 
   DeleteAllPages();

-};
+}

 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,
 
 bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
       const wxPoint& pos, const wxSize& size,


@@ -165,16 +147,15 @@ bool wxNotebook::Create(wxWindow *parent, wxWindowID id,
   Show( TRUE );
 
   return TRUE;
   Show( TRUE );
 
   return TRUE;

-};
+}

 
 int wxNotebook::GetSelection() const
 {
 
 int wxNotebook::GetSelection() const
 {

-  if (m_pages.Number() == 0)
-    return -1;
+  if (m_pages.Number() == 0) return -1;

 
   GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
 
 
   GtkNotebookPage *g_page = GTK_NOTEBOOK(m_widget)->cur_page;
 

-  wxNotebookPage *page = NULL;
+  wxNotebookPage *page = (wxNotebookPage *) NULL;

 
   wxNode *node = m_pages.First();
   while (node)
 
   wxNode *node = m_pages.First();
   while (node)


@@ -183,22 +164,22 @@ int wxNotebook::GetSelection() const
     if (page->m_page == g_page)
       break;
     node = node->Next();
     if (page->m_page == g_page)
       break;
     node = node->Next();

-  };
+  }

 
   wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
 
   return page->m_id;
 
   wxCHECK_MSG( node != NULL, -1, "wxNotebook: no selection?" );
 
   return page->m_id;

-};
+}

 
 int wxNotebook::GetPageCount() const
 {
   return m_pages.Number();
 
 int wxNotebook::GetPageCount() const
 {
   return m_pages.Number();

-};
+}

 
 int wxNotebook::GetRowCount() const
 {
   return 1;
 
 int wxNotebook::GetRowCount() const
 {
   return 1;

-};
+}

 
 wxString wxNotebook::GetPageText( int page ) const
 {
 
 wxString wxNotebook::GetPageText( int page ) const
 {


@@ -207,7 +188,7 @@ wxString wxNotebook::GetPageText( int page ) const
     return nb_page->m_text;
   else
     return "";
     return nb_page->m_text;
   else
     return "";

-};
+}

 
 int wxNotebook::GetPageImage( int page ) const
 {
 
 int wxNotebook::GetPageImage( int page ) const
 {


@@ -216,11 +197,11 @@ int wxNotebook::GetPageImage( int page ) const
     return nb_page->m_image;
   else
     return 0;
     return nb_page->m_image;
   else
     return 0;

-};
+}

 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {
 
 wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
 {

-  wxNotebookPage *nb_page = NULL;
+  wxNotebookPage *nb_page = (wxNotebookPage *) NULL;

 
   wxNode *node = m_pages.First();
   while (node)
 
   wxNode *node = m_pages.First();
   while (node)


@@ -229,86 +210,83 @@ wxNotebookPage* wxNotebook::GetNotebookPage(int page) const
     if (nb_page->m_id == page)
       return nb_page;
     node = node->Next();
     if (nb_page->m_id == page)
       return nb_page;
     node = node->Next();

-  };
+  }

 
   wxLogDebug( "Notebook page %d not found!", page );
 
 
   wxLogDebug( "Notebook page %d not found!", page );
 

-  return NULL;
-};
+  return (wxNotebookPage *) NULL;
+}

 
 int wxNotebook::SetSelection( int page )
 {
   int selOld = GetSelection();
   wxNotebookPage* nb_page = GetNotebookPage(page);
 
 int wxNotebook::SetSelection( int page )
 {
   int selOld = GetSelection();
   wxNotebookPage* nb_page = GetNotebookPage(page);

-  if (!nb_page)
-    return -1;
+  
+  if (!nb_page) return -1;

 
   int page_num = 0;
   GList *child = GTK_NOTEBOOK(m_widget)->children;
   while (child)
   {
 
   int page_num = 0;
   GList *child = GTK_NOTEBOOK(m_widget)->children;
   while (child)
   {

-    if (nb_page->m_page == (GtkNotebookPage*)child->data)
-      break;
+    if (nb_page->m_page == (GtkNotebookPage*)child->data)  break;

     page_num++;
     child = child->next;
     page_num++;
     child = child->next;

-  };
+  }

 
   if (!child) return -1;
 
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
 
   return selOld;
 
   if (!child) return -1;
 
   gtk_notebook_set_page( GTK_NOTEBOOK(m_widget), page_num );
 
   return selOld;

-};
+}

 
 

-void wxNotebook::AdvanceSelection(bool bForward)
+void wxNotebook::AdvanceSelection( bool bForward )

 {
 {

-  int nSel = GetSelection(),
-      nMax = GetPageCount();
+  int sel = GetSelection();
+  int max = GetPageCount();

 
 

-  if ( bForward ) {
-    SetSelection(nSel == nMax ? 0 : nSel + 1);
-  }
-  else {
-    SetSelection(nSel == 0 ? nMax : nSel - 1);
-  }
+  if (bForward) 
+    SetSelection( sel == max ? 0 : sel + 1 );
+  else
+    SetSelection( sel == 0 ? max : sel - 1 );

 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
   m_imageList = imageList;
 }
 
 void wxNotebook::SetImageList( wxImageList* imageList )
 {
   m_imageList = imageList;

-};
+}

 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
 
 bool wxNotebook::SetPageText( int page, const wxString &text )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);

-  if (!nb_page)
-    return FALSE;
+  
+  if (!nb_page) return FALSE;

 
   nb_page->m_text = text;
 
   return TRUE;
 
   nb_page->m_text = text;
 
   return TRUE;

-};
+}

 
 bool wxNotebook::SetPageImage( int page, int image )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
 
 bool wxNotebook::SetPageImage( int page, int image )
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);

-  if (!nb_page)
-    return FALSE;
+  
+  if (!nb_page) return FALSE;

 
   nb_page->m_image = image;
 
   return TRUE;
 
   nb_page->m_image = image;
 
   return TRUE;

-};
+}

 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {
 
 void wxNotebook::SetPageSize( const wxSize &WXUNUSED(size) )
 {

-  wxFAIL_MSG(_("wxNotebook::SetPageSize not implemented"));
-};
+  wxFAIL_MSG( "wxNotebook::SetPageSize not implemented" );
+}

 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {
 
 void wxNotebook::SetPadding( const wxSize &WXUNUSED(padding) )
 {

-  wxFAIL_MSG(_("wxNotebook::SetPadding not implemented"));
-};
+  wxFAIL_MSG( "wxNotebook::SetPadding not implemented" );
+}

 
 bool wxNotebook::DeleteAllPages()
 {
 
 bool wxNotebook::DeleteAllPages()
 {


@@ -320,10 +298,10 @@ bool wxNotebook::DeleteAllPages()
     DeletePage( page->m_id );
 
     page_node = m_pages.First();
     DeletePage( page->m_id );
 
     page_node = m_pages.First();

-  };
+  }

 
   return TRUE;
 
   return TRUE;

-};
+}

 
 bool wxNotebook::DeletePage( int page )
 {
 
 bool wxNotebook::DeletePage( int page )
 {


@@ -337,7 +315,7 @@ bool wxNotebook::DeletePage( int page )
     if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
     page_num++;
     child = child->next;
     if (nb_page->m_page == (GtkNotebookPage*)child->data) break;
     page_num++;
     child = child->next;

-  };
+  }

 
   wxASSERT( child );
 
 
   wxASSERT( child );
 


@@ -349,7 +327,7 @@ bool wxNotebook::DeletePage( int page )
   m_pages.DeleteObject( nb_page );
 
   return TRUE;
   m_pages.DeleteObject( nb_page );
 
   return TRUE;

-};
+}

 
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)
 
 bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
                          bool bSelect, int imageId)


@@ -357,43 +335,58 @@ bool wxNotebook::AddPage(wxWindow* win, const wxString& text,
   // we've created the notebook page in AddChild(). Now we just have to set
   // the caption for the page and set the others parameters.
 
   // we've created the notebook page in AddChild(). Now we just have to set
   // the caption for the page and set the others parameters.
 

-  // first, find the page
-  wxNotebookPage *page = NULL;
+  wxNotebookPage *page = (wxNotebookPage *) NULL;

 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();
 
   wxNode *node = m_pages.First();
   while (node)
   {
     page = (wxNotebookPage*)node->Data();

-    if ( page->m_client == win )
-      break; // found
+    if ( page->m_client == win ) break;

     node = node->Next();
     node = node->Next();

-  };
+  }
+
+  wxCHECK_MSG( page != NULL, FALSE, "Can't add a page whose parent is not the notebook!" );
+
+  if (imageId != -1) 
+  {
+    wxASSERT( m_imageList != NULL );

 
 

-  wxCHECK_MSG(page != NULL, FALSE,
-              _("Can't add a page whose parent is not the notebook!"));
+    wxBitmap *bmp = m_imageList->GetBitmap(imageId);
+    GdkPixmap *pixmap = bmp->GetPixmap();
+    GdkBitmap *mask = (GdkBitmap*) NULL;
+    if (bmp->GetMask()) mask = bmp->GetMask()->GetBitmap();
+    GtkWidget *pixmapwid = gtk_pixmap_new (pixmap, mask );
+
+    gtk_box_pack_start(GTK_BOX(page->m_box), pixmapwid, FALSE, FALSE, 3);
+
+    gtk_widget_show(pixmapwid);
+  }

 
   // then set the attributes
   page->m_text = text;
 
   // then set the attributes
   page->m_text = text;

-  if ( page->m_text.IsEmpty() )
-    page->m_text = "";
+  if (page->m_text.IsEmpty()) page->m_text = "";

   page->m_image = imageId;
   page->m_image = imageId;

-  gtk_label_set(page->m_label, page->m_text);
+  page->m_label = (GtkLabel *)gtk_label_new(page->m_text);
+  gtk_box_pack_start( GTK_BOX(page->m_box), (GtkWidget *)page->m_label, FALSE, FALSE, 3);

 
 

-  if ( bSelect ) {
-    SetSelection(GetPageCount());
-  }
+  // @@@: what does this do? do we still need it?
+  // gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+
+  gtk_widget_show((GtkWidget *)page->m_label);
+
+  if (bSelect) SetSelection(GetPageCount());

 
   return TRUE;
 
   return TRUE;

-};
+}

 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)
 
 wxWindow *wxNotebook::GetPage( int page ) const
 {
   wxNotebookPage* nb_page = GetNotebookPage(page);
   if (!nb_page)

-    return NULL;
+    return (wxWindow *) NULL;

   else
     return nb_page->m_client;
   else
     return nb_page->m_client;

-};
+}

 
 void wxNotebook::AddChild( wxWindow *win )
 {
 
 void wxNotebook::AddChild( wxWindow *win )
 {


@@ -402,11 +395,12 @@ void wxNotebook::AddChild( wxWindow *win )
   wxNotebookPage *page = new wxNotebookPage();
 
   page->m_id = GetPageCount();
   wxNotebookPage *page = new wxNotebookPage();
 
   page->m_id = GetPageCount();

-  page->m_label = (GtkLabel *)gtk_label_new(_("Handle"));
+
+  page->m_box = gtk_hbox_new (FALSE, 0);
+  gtk_container_border_width(GTK_CONTAINER(page->m_box), 2);
+

   page->m_client = win;
   page->m_client = win;

-  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget,
-                            (GtkWidget *)page->m_label);
-  gtk_misc_set_alignment(GTK_MISC(page->m_label), 0.0, 0.5);
+  gtk_notebook_append_page( GTK_NOTEBOOK(m_widget), win->m_widget, page->m_box );

 
   page->m_page =
     (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);
 
   page->m_page =
     (GtkNotebookPage*) (g_list_last(GTK_NOTEBOOK(m_widget)->children)->data);


@@ -418,12 +412,12 @@ void wxNotebook::AddChild( wxWindow *win )
 
   if (!page->m_page)
   {
 
   if (!page->m_page)
   {

-     wxLogFatalError( _("Notebook page creation error") );
+     wxLogFatalError( "Notebook page creation error" );

      return;
   }
 
   m_pages.Append( page );
      return;
   }
 
   m_pages.Append( page );

-};
+}

 
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )
 
 // override these 2 functions to do nothing: everything is done in OnSize
 void wxNotebook::SetConstraintSizes( bool WXUNUSED(recurse) )


@@ -442,3 +436,4 @@ bool wxNotebook::DoPhase( int WXUNUSED(nPhase) )
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxNotebookEvent, wxCommandEvent)

+