Explicitly set "C" locale for the tests using decimal point.

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

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index dd68dda50558ae6ff9eaad6af8352ee243fb68ab..1d7817bcdb291976bb3a85e1977172bbb737316e 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -29,9 +29,9 @@
 // the lines below duplicate the same definitions in collpaneg.cpp, if we have
 // another implementation of this class we should extract them to a common file
 
 // the lines below duplicate the same definitions in collpaneg.cpp, if we have
 // another implementation of this class we should extract them to a common file
 

-const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane");
+const char wxCollapsiblePaneNameStr[] = "collapsiblePane";

 
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
+wxDEFINE_EVENT( wxEVT_COMMAND_COLLPANE_CHANGED, wxCollapsiblePaneEvent );

 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)
 


@@ -198,13 +198,18 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
 
     // this the real "pane"
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
 
     // this the real "pane"
     m_pPane = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,

-                           wxTAB_TRAVERSAL|wxNO_BORDER);
+                          wxTAB_TRAVERSAL|wxNO_BORDER, wxS("wxCollapsiblePanePane"));

 
     gtk_widget_show(m_widget);
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 
 
     gtk_widget_show(m_widget);
     m_parent->DoAddChild( this );
 
     PostCreation(size);
 

+    // we should blend into our parent background
+    const wxColour bg = parent->GetBackgroundColour();
+    SetBackgroundColour(bg);
+    m_pPane->SetBackgroundColour(bg);
+

     // remember the size of this control when it's collapsed
     m_szCollapsed = GetBestSize();
 
     // remember the size of this control when it's collapsed
     m_szCollapsed = GetBestSize();
 


@@ -244,7 +249,8 @@ bool wxCollapsiblePane::IsCollapsed() const
 
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {
 
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {

-    gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str));
+    gtk_expander_set_label(GTK_EXPANDER(m_widget),
+                           wxGTK_CONV(GTKConvertMnemonics(str)));

 
     // FIXME: we need to update our collapsed width in some way but using GetBestSize()
     // we may get the size of the control with the pane size summed up if we are expanded!
 
     // FIXME: we need to update our collapsed width in some way but using GetBestSize()
     // we may get the size of the control with the pane size summed up if we are expanded!


@@ -263,7 +269,7 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
 #endif
 
     // here we need to resize the pane window otherwise, even if the GtkExpander container
 #endif
 
     // here we need to resize the pane window otherwise, even if the GtkExpander container

-    // is expanded or shrinked, the pane window won't be updated!
+    // is expanded or shrunk, the pane window won't be updated!

     m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y);
 
     // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout
     m_pPane->SetSize(ev.GetSize().x, ev.GetSize().y - m_szCollapsed.y);
 
     // we need to explicitely call m_pPane->Layout() or else it won't correctly relayout


@@ -271,5 +277,15 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
     m_pPane->Layout();
 }
 
     m_pPane->Layout();
 }
 

+
+GdkWindow *wxCollapsiblePane::GTKGetWindow(wxArrayGdkWindows& windows) const
+{
+    GtkWidget *label = gtk_expander_get_label_widget( GTK_EXPANDER(m_widget) );
+    windows.Add( label->window );
+    windows.Add( m_widget->window );
+
+    return NULL;
+}
+

 #endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)
 
 #endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)