remove unused wxMenuBar::m_style

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

diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp
index e616adb537bd9f399c12878c7adef6652d8c30a6..f50d3b270c0608a5fa8924daf7c802352c2d4c78 100644 (file)
--- a/src/gtk/collpane.cpp
+++ b/src/gtk/collpane.cpp
@@ -17,7 +17,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)

 
 #include "wx/collpane.h"
 #include "wx/toplevel.h"
 
 #include "wx/collpane.h"
 #include "wx/toplevel.h"


@@ -25,9 +25,15 @@
 #include "wx/panel.h"
 
 #include "wx/gtk/private.h"
 #include "wx/panel.h"
 
 #include "wx/gtk/private.h"

-#include "wx/gtk/win_gtk.h"

 
 

-#include <gtk/gtkexpander.h>
+// 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");
+
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED)
+
+IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -39,9 +45,10 @@
 
 extern "C" {
 
 
 extern "C" {
 

-static void gtk_collapsiblepane_expanded_callback (GObject    *object,
-                                                    GParamSpec *param_spec,
-                                                    wxCollapsiblePane *p)
+static void
+gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
+                                      GParamSpec * WXUNUSED(param_spec),
+                                      wxCollapsiblePane *p)

 {
     // NB: unlike for the "activate" signal, when this callback is called, if
     //     we try to query the "collapsed" status through p->IsCollapsed(), we
 {
     // NB: unlike for the "activate" signal, when this callback is called, if
     //     we try to query the "collapsed" status through p->IsCollapsed(), we


@@ -95,8 +102,8 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
     {
         // fire an event
         wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
     {
         // fire an event
         wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());

-        p->GetEventHandler()->ProcessEvent(ev);
-    
+        p->HandleWindowEvent(ev);
+

         // the user asked to explicitely handle the resizing itself...
         return;
     }
         // the user asked to explicitely handle the resizing itself...
         return;
     }


@@ -106,7 +113,7 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
     if ( top && top->GetSizer() )
     {
         // 2) recalculate minimal size of the top window
     if ( top && top->GetSizer() )
     {
         // 2) recalculate minimal size of the top window

-        wxSize sz = top->GetSizer()->CalcMin();
+        sz = top->GetSizer()->CalcMin();

 
         if (top->m_mainWidget)
         {
 
         if (top->m_mainWidget)
         {


@@ -119,39 +126,11 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
             //     when the expander is collapsed!)
             gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
 
             //     when the expander is collapsed!)
             gtk_window_set_resizable (GTK_WINDOW (top->m_widget), p->IsExpanded());
 

-            // 4) set size hints: note that this code has been taken and adapted
-            //    from src/gtk/toplevel.cpp
-            GdkGeometry geom;
-
-            geom.min_width = sz.x;
-            geom.min_height = sz.y;
-
-            gtk_window_set_geometry_hints( GTK_WINDOW(top->m_widget),
-                                           (GtkWidget*) NULL,
-                                           &geom,
-                                           GDK_HINT_MIN_SIZE );
-
-            // 5) set size: also this code has been adapted from src/gtk/toplevel.cpp
-            //    to do the size changes immediately and not delaying them in the idle
-            //    time
-            top->m_width = sz.x;
-            top->m_height = sz.y;
-
-            int client_x = top->m_miniEdge;
-            int client_y = top->m_miniEdge + top->m_miniTitle;
-            int client_w = top->m_width - 2*top->m_miniEdge;
-            int client_h = top->m_height - 2*top->m_miniEdge - top->m_miniTitle;
-            if (client_w < 0)
-                client_w = 0;
-            if (client_h < 0)
-                client_h = 0;
-
-            gtk_pizza_set_size( GTK_PIZZA(top->m_mainWidget),
-                                top->m_wxwindow,
-                                client_x, client_y, client_w, client_h );
-
-            gtk_widget_set_size_request( top->m_wxwindow, sz.x, sz.y );
+            // 4) set size hints
+            top->SetSizeHints(sz.x, sz.y);

 
 

+            // 5) set size
+            top->SetClientSize(sz);

         }
     }
 
         }
     }
 


@@ -164,7 +143,7 @@ static void gtk_collapsiblepane_expanded_callback (GObject    *object,
 
     // fire an event
     wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());
 
     // fire an event
     wxCollapsiblePaneEvent ev(p, p->GetId(), p->IsCollapsed());

-    p->GetEventHandler()->ProcessEvent(ev);
+    p->HandleWindowEvent(ev);

 }
 }
 
 }
 }
 


@@ -183,9 +162,9 @@ gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child)
 // wxCollapsiblePane
 //-----------------------------------------------------------------------------
 
 // wxCollapsiblePane
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxGenericCollapsiblePane)
+IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl)

 
 

-BEGIN_EVENT_TABLE(wxCollapsiblePane, wxGenericCollapsiblePane)
+BEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase)

     EVT_SIZE(wxCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(wxCollapsiblePane::OnSize)
 END_EVENT_TABLE()
 


@@ -198,10 +177,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
                                const wxValidator& val,
                                const wxString& name)
 {
                                const wxValidator& val,
                                const wxString& name)
 {

-    if (gtk_check_version(2,4,0))
-        return wxGenericCollapsiblePane::Create(parent, id, label,
-                                                pos, size, style, val, name);
-

     m_bIgnoreNextChange = false;
 
     if ( !PreCreation( parent, pos, size ) ||
     m_bIgnoreNextChange = false;
 
     if ( !PreCreation( parent, pos, size ) ||


@@ -241,60 +216,42 @@ bool wxCollapsiblePane::Create(wxWindow *parent,
 
 wxSize wxCollapsiblePane::DoGetBestSize() const
 {
 
 wxSize wxCollapsiblePane::DoGetBestSize() const
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );
+    wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") );

 
 

-        GtkRequisition req;
-        req.width = 2;
-        req.height = 2;
-        (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
-                (m_widget, &req );
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
+            (m_widget, &req );

 
 

-        // notice that we do not cache our best size here as it changes
-        // all times the user expands/hide our pane
-        return wxSize(req.width, req.height);
-    }
-
-    return wxGenericCollapsiblePane::DoGetBestSize();
+    // notice that we do not cache our best size here as it changes
+    // all times the user expands/hide our pane
+    return wxSize(req.width, req.height);

 }
 
 void wxCollapsiblePane::Collapse(bool collapse)
 {
 }
 
 void wxCollapsiblePane::Collapse(bool collapse)
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        // optimization
-        if (IsCollapsed() == collapse)
-            return;
+    // optimization
+    if (IsCollapsed() == collapse)
+        return;

 
 

-        // do not send event in next signal handler call
-        m_bIgnoreNextChange = true;
-        gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse);
-    }
-    else
-        wxGenericCollapsiblePane::Collapse(collapse);
+    // do not send event in next signal handler call
+    m_bIgnoreNextChange = true;
+    gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse);

 }
 
 bool wxCollapsiblePane::IsCollapsed() const
 {
 }
 
 bool wxCollapsiblePane::IsCollapsed() const
 {

-    if (!gtk_check_version(2,4,0))
-        return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget));
-
-    return wxGenericCollapsiblePane::IsCollapsed();
+    return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget));

 }
 
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {
 }
 
 void wxCollapsiblePane::SetLabel(const wxString &str)
 {

-    if (!gtk_check_version(2,4,0))
-    {
-        gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str));
+    gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(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!
-        //m_szCollapsed.x = GetBestSize().x;
-    }
-    else
-        wxGenericCollapsiblePane::SetLabel(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!
+    //m_szCollapsed.x = GetBestSize().x;

 }
 
 void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
 }
 
 void wxCollapsiblePane::OnSize(wxSizeEvent &ev)


@@ -317,5 +274,5 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev)
     m_pPane->Layout();
 }
 
     m_pPane->Layout();
 }
 

-#endif // wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__)