moved win_gtk.h header to wx/gtk/private, it's for internal use only

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

diff --git a/Makefile.in b/Makefile.in
index cc34564bfa3c5d573efca3b93060e92dc1a7e3b9..b2ba33f52bded2a3a8a4a26f25e7e43c980dd9f8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2101,7 +2101,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR =  \
        wx/gtk/region.h \
        wx/gtk/tooltip.h \
        wx/gtk/toplevel.h \
        wx/gtk/region.h \
        wx/gtk/tooltip.h \
        wx/gtk/toplevel.h \

-       wx/gtk/win_gtk.h \

        wx/gtk/window.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR)
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 
        wx/gtk/window.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@LOWLEVEL_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR)
 @COND_TOOLKIT_MAC@LOWLEVEL_HDR = 

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 5a8f01d2770f5625aa1d62febaa27fdaa17b312d..a2402bea6786940e91813bebca79495fa5586d26 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1056,7 +1056,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h
     wx/gtk/region.h
     wx/gtk/tooltip.h
     wx/gtk/toplevel.h

-    wx/gtk/win_gtk.h

     wx/gtk/window.h
 </set>
 <set var="GTK_SRC" hints="files">
     wx/gtk/window.h
 </set>
 <set var="GTK_SRC" hints="files">

diff --git a/include/wx/gtk/private/win_gtk.h b/include/wx/gtk/private/win_gtk.h
new file mode 100644 (file)
index 0000000..f98a775
--- /dev/null
+++ b/include/wx/gtk/private/win_gtk.h
@@ -0,0 +1,38 @@
+/* ///////////////////////////////////////////////////////////////////////////
+// Name:        win_gtk.h
+// Purpose:     native GTK+ widget for wxWindow
+// Author:      Robert Roebling
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////// */
+
+#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())
+
+struct WXDLLIMPEXP_CORE wxPizza
+{
+    // borders styles which can be used with wxPizza
+    enum { BORDER_STYLES =
+        wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME };
+
+    static GtkWidget* New(long windowStyle = 0);
+    static GType type();
+    void move(GtkWidget* widget, int x, int y);
+    void scroll(int dx, int dy);
+    void get_border_widths(int& x, int& y);
+
+    GtkFixed m_fixed;
+    GdkWindow* m_backing_window;
+    int m_scroll_x;
+    int m_scroll_y;
+    int m_border_style;
+    bool m_is_scrollable;
+};
+
+#endif // _WX_GTK_PIZZA_H_

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
deleted file mode 100644 (file)
index f98a775..0000000
--- a/include/wx/gtk/win_gtk.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* ///////////////////////////////////////////////////////////////////////////
-// Name:        win_gtk.h
-// Purpose:     native GTK+ widget for wxWindow
-// Author:      Robert Roebling
-// Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////// */
-
-#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())
-
-struct WXDLLIMPEXP_CORE wxPizza
-{
-    // borders styles which can be used with wxPizza
-    enum { BORDER_STYLES =
-        wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME };
-
-    static GtkWidget* New(long windowStyle = 0);
-    static GType type();
-    void move(GtkWidget* widget, int x, int y);
-    void scroll(int dx, int dy);
-    void get_border_widths(int& x, int& y);
-
-    GtkFixed m_fixed;
-    GdkWindow* m_backing_window;
-    int m_scroll_x;
-    int m_scroll_y;
-    int m_border_style;
-    bool m_is_scrollable;
-};
-
-#endif // _WX_GTK_PIZZA_H_

diff --git a/src/gtk/popupwin.cpp b/src/gtk/popupwin.cpp
index a41e19384208ccbf7acd0c9a9072b2de8b0015cd..a16315563ba736ce45c364fb4f077a213a0f583d 100644 (file)
--- a/src/gtk/popupwin.cpp
+++ b/src/gtk/popupwin.cpp
@@ -19,7 +19,7 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

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

 
 //-----------------------------------------------------------------------------
 // "button_press"
 
 //-----------------------------------------------------------------------------
 // "button_press"

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 2f08c8dedde010046b150b8932d8fa6808f17471..7de72841d889a4f04a7c7c18c167982651c4d684 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -38,7 +38,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 

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

 
 #include "wx/unix/utilsx11.h"
 
 
 #include "wx/unix/utilsx11.h"
 

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 6eb8b4e1e28aac2cda29d0f5b56dcbfcb9769c4a..cc120380636eb24e02959470e26738d78d2450a6 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -14,7 +14,7 @@
 #endif
 
 #include "wx/platform.h"
 #endif
 
 #include "wx/platform.h"

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

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/gtk/win_gtk.cpp b/src/gtk/win_gtk.cpp
index 1ad4efd4d27ec759a12479c54b804fc11c7d4508..97755632fc92f3b2c50efa270caadf19880bb26d 100644 (file)
--- a/src/gtk/win_gtk.cpp
+++ b/src/gtk/win_gtk.cpp
@@ -8,7 +8,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "wx/defs.h"

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

 
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget
 
 /*
 wxPizza is a custom GTK+ widget derived from GtkFixed.  A custom widget

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index ed85afa1379add89c2af270211605310922fad07..b548b0460c76a6cb9e873279203b639a0397ed75 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -36,7 +36,7 @@
 #include <ctype.h>
 
 #include "wx/gtk/private.h"
 #include <ctype.h>
 
 #include "wx/gtk/private.h"

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

 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>