Disable wxUSE_ENH_METAFILE for wxGTK builds.

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

diff --git a/src/gtk/slider.cpp b/src/gtk/slider.cpp
index 718dda763c8fe8761857dd9cafcee7fc4a1cd6a6..70a10d6d02c01583cadcadc97c6361079946bde2 100644 (file)
--- a/src/gtk/slider.cpp
+++ b/src/gtk/slider.cpp
@@ -60,7 +60,7 @@ ProcessScrollEvent(wxSlider *win, wxEventType evtType)
     }
 
     // and also generate a command event for compatibility
     }
 
     // and also generate a command event for compatibility

-    wxCommandEvent event( wxEVT_COMMAND_SLIDER_UPDATED, win->GetId() );
+    wxCommandEvent event( wxEVT_SLIDER, win->GetId() );

     event.SetEventObject( win );
     event.SetInt( value );
     win->HandleWindowEvent( event );
     event.SetEventObject( win );
     event.SetInt( value );
     win->HandleWindowEvent( event );


@@ -307,45 +307,32 @@ bool wxSlider::Create(wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-
-    if (style & wxSL_VERTICAL)
-        m_scale = gtk_vscale_new( NULL );
-    else
-        m_scale = gtk_hscale_new( NULL );
+    const bool isVertical = (style & wxSL_VERTICAL) != 0;
+    m_scale = gtk_scale_new(GtkOrientation(isVertical), NULL);

 
     if (style & wxSL_MIN_MAX_LABELS)
     {
         gtk_widget_show( m_scale );
 
 
     if (style & wxSL_MIN_MAX_LABELS)
     {
         gtk_widget_show( m_scale );
 

-        if (style & wxSL_VERTICAL)
-            m_widget = gtk_hbox_new(false, 0);
-        else
-            m_widget = gtk_vbox_new(false, 0);
-        gtk_container_add( GTK_CONTAINER(m_widget), m_scale );
+        m_widget = gtk_box_new(GtkOrientation(!isVertical), 0);
+        gtk_box_pack_start(GTK_BOX(m_widget), m_scale, true, true, 0);

 
 

-        GtkWidget *box;
-        if (style & wxSL_VERTICAL)
-            box = gtk_vbox_new(false,0);
-        else
-            box = gtk_hbox_new(false,0);
+        GtkWidget* box = gtk_box_new(GtkOrientation(isVertical), 0);

         gtk_widget_show(box);
         gtk_widget_show(box);

-        gtk_container_add( GTK_CONTAINER(m_widget), box );
+        gtk_box_pack_start(GTK_BOX(m_widget), box, true, true, 0);

 
         m_minLabel = gtk_label_new(NULL);
         gtk_widget_show( m_minLabel );
 
         m_minLabel = gtk_label_new(NULL);
         gtk_widget_show( m_minLabel );

-        gtk_container_add( GTK_CONTAINER(box), m_minLabel );
-        gtk_box_set_child_packing( GTK_BOX(box), m_minLabel, FALSE, FALSE, 0, GTK_PACK_START );
+        gtk_box_pack_start(GTK_BOX(box), m_minLabel, false, false, 0);

 
         // expanding empty space between the min/max labels
         GtkWidget *space = gtk_label_new(NULL);
         gtk_widget_show( space );
 
         // expanding empty space between the min/max labels
         GtkWidget *space = gtk_label_new(NULL);
         gtk_widget_show( space );

-        gtk_container_add( GTK_CONTAINER(box), space );
-        gtk_box_set_child_packing( GTK_BOX(box), space, TRUE, FALSE, 0, GTK_PACK_START );
+        gtk_box_pack_start(GTK_BOX(box), space, true, false, 0);

 
         m_maxLabel = gtk_label_new(NULL);
         gtk_widget_show( m_maxLabel );
 
         m_maxLabel = gtk_label_new(NULL);
         gtk_widget_show( m_maxLabel );

-        gtk_container_add( GTK_CONTAINER(box), m_maxLabel );
-        gtk_box_set_child_packing( GTK_BOX(box), m_maxLabel, FALSE, FALSE, 0, GTK_PACK_END );
+        gtk_box_pack_end(GTK_BOX(box), m_maxLabel, false, false, 0);

     }
     else
     {
     }
     else
     {


@@ -533,7 +520,7 @@ GdkWindow *wxSlider::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 wxVisualAttributes
 wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxSlider::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_vscale_new(NULL));
+    return GetDefaultAttributesFromGTKWidget(gtk_scale_new(GTK_ORIENTATION_VERTICAL, NULL));

 }
 
 #endif // wxUSE_SLIDER
 }
 
 #endif // wxUSE_SLIDER