Define WXBUILDING in Xcode projects.

[wxWidgets.git] / include / wx / gtk / private / win_gtk.h

diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h
index 6bde3f5dfd3946319a207495fd84c33f0c38ddd6..2f15b0a83fc9c82e66b3e1ad212d2c57baad4944 100644 (file)
--- a/include/wx/gtk/private/win_gtk.h
+++ b/include/wx/gtk/private/win_gtk.h
@@ -1,5 +1,5 @@
 /* ///////////////////////////////////////////////////////////////////////////
 /* ///////////////////////////////////////////////////////////////////////////

-// Name:        win_gtk.h
+// Name:        wx/gtk/private/win_gtk.h

 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:     native GTK+ widget for wxWindow
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,8 +10,6 @@
 #ifndef _WX_GTK_PIZZA_H_
 #define _WX_GTK_PIZZA_H_
 
 #ifndef _WX_GTK_PIZZA_H_
 #define _WX_GTK_PIZZA_H_
 

-#include <gtk/gtkfixed.h>
-

 #define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza)
 #define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type())
 
 #define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza)
 #define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type())
 


@@ -23,17 +21,16 @@ struct WXDLLIMPEXP_CORE wxPizza
 
     static GtkWidget* New(long windowStyle = 0);
     static GType type();
 
     static GtkWidget* New(long windowStyle = 0);
     static GType type();

-    void move(GtkWidget* widget, int x, int y);
-    void put(GtkWidget* widget, int x, int y);
+    void move(GtkWidget* widget, int x, int y, int width, int height);
+    void put(GtkWidget* widget, int x, int y, int width, int height);

     void scroll(int dx, int dy);
     void scroll(int dx, int dy);

-    void get_border_widths(int& x, int& y);
+    void get_border(GtkBorder& border);

 
     GtkFixed m_fixed;
 
     GtkFixed m_fixed;

-    GdkWindow* m_draw_window;
+    GList* m_children;

     int m_scroll_x;
     int m_scroll_y;
     int m_scroll_x;
     int m_scroll_y;

-    int m_border_style;
-    bool m_is_scrollable;
+    int m_windowStyle;

 };
 
 #endif // _WX_GTK_PIZZA_H_
 };
 
 #endif // _WX_GTK_PIZZA_H_