unused win_gtk stuff

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 81f0ecebb94aa20949908ad8e61ed8a05265896f..8b8769b21488595ff9dc17c5d658c362632d5bd3 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -15,15 +15,11 @@
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
 #include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
 
 #include "wx/dlimpexp.h"
 
 #define GTK_PIZZA(obj)          GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza)
-#define GTK_PIZZA_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass)
 #define GTK_IS_PIZZA(obj)       GTK_CHECK_TYPE (obj, gtk_pizza_get_type ())
 
 /* Shadow types */
@@ -62,13 +58,9 @@ struct _GtkPizza
 
     GdkWindow *bin_window;
 
-    GdkVisibilityState visibility;
-    gulong configure_serial;
     gint scroll_x;
     gint scroll_y;
 
-    gboolean clear_on_draw;
-    gboolean use_filter;
     gboolean external_expose;
 };
 
@@ -90,14 +82,6 @@ WXDLLIMPEXP_CORE
 void       gtk_pizza_set_shadow_type (GtkPizza          *pizza,
                                       GtkMyShadowType    type);
 
-WXDLLIMPEXP_CORE
-void       gtk_pizza_set_clear       (GtkPizza          *pizza,
-                                      gboolean           clear);
-
-WXDLLIMPEXP_CORE
-void       gtk_pizza_set_filter      (GtkPizza          *pizza,
-                                      gboolean           use);
-
 WXDLLIMPEXP_CORE
 void       gtk_pizza_set_external    (GtkPizza          *pizza,
                                       gboolean           expose);
@@ -107,10 +91,6 @@ void       gtk_pizza_scroll          (GtkPizza          *pizza,
                                       gint               dx,
                                       gint               dy);
 
-WXDLLIMPEXP_CORE
-gint       gtk_pizza_child_resized   (GtkPizza          *pizza,
-                                      GtkWidget         *widget);
-
 WXDLLIMPEXP_CORE
 void       gtk_pizza_put             (GtkPizza          *pizza,
                                       GtkWidget         *widget,
@@ -119,18 +99,6 @@ void       gtk_pizza_put             (GtkPizza          *pizza,
                                       gint               width,
                                       gint               height);
 
-WXDLLIMPEXP_CORE
-void       gtk_pizza_move            (GtkPizza          *pizza,
-                                      GtkWidget         *widget,
-                                      gint               x,
-                                      gint               y );
-
-WXDLLIMPEXP_CORE
-void       gtk_pizza_resize          (GtkPizza          *pizza,
-                                      GtkWidget         *widget,
-                                      gint               width,
-                                      gint               height );
-
 WXDLLIMPEXP_CORE
 void       gtk_pizza_set_size        (GtkPizza          *pizza,
                                       GtkWidget         *widget,

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 2d830719c9f94b5f97506e05adf56e208e5b3771..6fb97fb3ba3519caa3e599b5bf4a8038e26b376a 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -45,10 +45,6 @@
     #include "wx/univ/renderer.h"
 #endif
 
-#if wxUSE_THREADS
-    #include "wx/thread.h"
-#endif
-
 #include <unistd.h>
 
 #ifdef HAVE_POLL
@@ -80,7 +76,7 @@
 #include "wx/gtk/win_gtk.h"
 #include "wx/gtk/private.h"
 
-#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 //-----------------------------------------------------------------------------
 // link GnomeVFS

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 7d76807bfc9881f9f2995d1ededa83e01a18699b..3c28dee504b8843cd7836afcc640aee011081eba 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -406,8 +406,6 @@ bool wxGLCanvas::Create( wxWindow *parent,
 
     gtk_widget_set_double_buffered( m_glWidget, FALSE );
 
-    gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
-
     g_signal_connect (m_wxwindow, "realize",
                       G_CALLBACK (gtk_glwindow_realized_callback),
                       this);

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 85c77d7c025afbf24cb92515faadadea7a3de586..f700ab07cb294d82e37709d8f1968dd7c6c98c7c 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -200,13 +200,9 @@ gtk_pizza_init (GtkPizza *pizza)
     pizza->xoffset = 0;
     pizza->yoffset = 0;
 
-    pizza->configure_serial = 0;
     pizza->scroll_x = 0;
     pizza->scroll_y = 0;
-    pizza->visibility = GDK_VISIBILITY_PARTIAL;
 
-    pizza->clear_on_draw = TRUE;
-    pizza->use_filter = TRUE;
     pizza->external_expose = FALSE;
 }
 
@@ -247,26 +243,6 @@ gtk_pizza_set_shadow_type (GtkPizza        *pizza,
     }
 }
 
-void
-gtk_pizza_set_clear (GtkPizza  *pizza,
-                     gboolean   clear)
-{
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-
-    pizza->clear_on_draw = clear;
-}
-
-void
-gtk_pizza_set_filter (GtkPizza  *pizza,
-                      gboolean   use)
-{
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-
-    pizza->use_filter = use;
-}
-
 void
 gtk_pizza_set_external (GtkPizza  *pizza,
                         gboolean   expose)
@@ -309,76 +285,6 @@ gtk_pizza_put (GtkPizza   *pizza,
     gtk_widget_set_size_request (widget, width, height);
 }
 
-void
-gtk_pizza_move (GtkPizza     *pizza,
-                  GtkWidget  *widget,
-                  gint        x,
-                  gint        y)
-{
-    GtkPizzaChild *child;
-    GList *children;
-
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-    g_return_if_fail (widget != NULL);
-
-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (child->widget == widget)
-        {
-            if ((child->x == x) && (child->y == y))
-                break;
-
-            child->x = x;
-            child->y = y;
-
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
-                gtk_widget_queue_resize (widget);
-            break;
-        }
-    }
-}
-
-void
-gtk_pizza_resize (GtkPizza    *pizza,
-                  GtkWidget   *widget,
-                  gint         width,
-                  gint         height)
-{
-    GtkPizzaChild *child;
-    GList *children;
-
-    g_return_if_fail (pizza != NULL);
-    g_return_if_fail (GTK_IS_PIZZA (pizza));
-    g_return_if_fail (widget != NULL);
-
-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (child->widget == widget)
-        {
-            if ((child->width == width) && (child->height == height))
-                break;
-
-            child->width = width;
-            child->height = height;
-
-            gtk_widget_set_size_request (widget, width, height);
-
-            if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_VISIBLE (pizza))
-                gtk_widget_queue_resize (widget);
-            break;
-        }
-    }
-}
-
 void
 gtk_pizza_set_size (GtkPizza   *pizza,
                     GtkWidget  *widget,
@@ -432,33 +338,6 @@ gtk_pizza_set_size (GtkPizza   *pizza,
     }
 }
 
-gint
-gtk_pizza_child_resized  (GtkPizza   *pizza,
-                          GtkWidget  *widget)
-{
-    GtkPizzaChild *child;
-    GList *children;
-
-    g_return_val_if_fail (pizza != NULL, FALSE);
-    g_return_val_if_fail (GTK_IS_PIZZA (pizza), FALSE);
-    g_return_val_if_fail (widget != NULL, FALSE);
-
-    children = pizza->children;
-    while (children)
-    {
-        child = children->data;
-        children = children->next;
-
-        if (child->widget == widget)
-        {
-            return ((child->width == widget->allocation.width) &&
-                    (child->height == widget->allocation.height));
-        }
-    }
-
-    return FALSE;
-}
-
 static void
 gtk_pizza_map (GtkWidget *widget)
 {
@@ -868,19 +747,6 @@ gtk_pizza_adjust_allocations (GtkPizza *pizza,
     }
 }
 
-
-/* This is the main routine to do the scrolling. Scrolling is
- * done by "Guffaw" scrolling, as in the Mozilla XFE, with
- * a few modifications.
- *
- * The main improvement is that we keep track of whether we
- * are obscured or not. If not, we ignore the generated expose
- * events and instead do the exposes ourself, without having
- * to wait for a roundtrip to the server. This also provides
- * a limited form of expose-event compression, since we do
- * the affected area as one big chunk.
- */
-
 void
 gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
 {