put the useable border styles in one place

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

diff --git a/include/wx/gtk/win_gtk.h b/include/wx/gtk/win_gtk.h
index 696530f9cd22ca305b1d1b6a3f0a99ab3b54500a..f98a775a3df2786371c097da7d201b15e924d0ac 100644 (file)
--- a/include/wx/gtk/win_gtk.h
+++ b/include/wx/gtk/win_gtk.h
@@ -17,6 +17,10 @@
 
 struct WXDLLIMPEXP_CORE wxPizza
 {
 
 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);
     static GtkWidget* New(long windowStyle = 0);
     static GType type();
     void move(GtkWidget* widget, int x, int y);

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index e438bbcf1ae881e728b5303542d351b35b1c5747..bd82beb7e69af1ddc20e800b26a0e4b5a36b6647 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2414,7 +2414,7 @@ void wxWindowGTK::PostCreation()
 
         // border drawing
 #ifndef __WXUNIVERSAL__
 
         // border drawing
 #ifndef __WXUNIVERSAL__

-        if (HasFlag(wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME))
+        if (HasFlag(wxPizza::BORDER_STYLES))

         {
             g_signal_connect(m_widget, "expose_event",
                 G_CALLBACK(expose_event_border), this);
         {
             g_signal_connect(m_widget, "expose_event",
                 G_CALLBACK(expose_event_border), this);