Allow building wxGTK3 with Broadway backend.

Use GDK_WINDOWING_BROADWAY to fix compilation with it.

Closes #14469.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 20d2c67f45b13da1609a8d203072768f581ef474..8d1c48a56db594e8d09750e7b993b1486c20b022 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -531,6 +531,10 @@ All (GUI):
 - Add possibility to hide and show again wxRibbonBar pages (wxBen).
 - Fix item data access in wxDataViewListCtrl (Kry).
 
 - Add possibility to hide and show again wxRibbonBar pages (wxBen).
 - Fix item data access in wxDataViewListCtrl (Kry).
 

+wxGTK:
+
+- Allow building wxGTK3 with Broadway backend (Kolya Kosenko).
+

 
 2.9.4: (released 2012-07-09)
 ------
 
 2.9.4: (released 2012-07-09)
 ------

diff --git a/src/gtk/nativewin.cpp b/src/gtk/nativewin.cpp
index 99ded721f8bfe233f42119bc7cd11040b4535ed4..d95d98094d9d49a4c719114ac3d328866649c44d 100644 (file)
--- a/src/gtk/nativewin.cpp
+++ b/src/gtk/nativewin.cpp
@@ -96,7 +96,11 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
 {
     bool rc;
 #ifdef __WXGTK3__
 {
     bool rc;
 #ifdef __WXGTK3__

+#ifdef GDK_WINDOWING_X11

     GdkWindow * const win = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), anid);
     GdkWindow * const win = gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), anid);

+#else
+    GdkWindow * const win = NULL;
+#endif

 #else
     GdkWindow * const win = gdk_window_foreign_new(anid);
 #endif
 #else
     GdkWindow * const win = gdk_window_foreign_new(anid);
 #endif

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index f68fddcbf0e24ded25df7e90565204488367b80d..728c9f6cb922e5ae16b1e262d3559c0dd5593dcd 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -504,3 +504,17 @@ wxGUIAppTraits::GetStandardCmdLineOptions(wxArrayString& names,
 }
 
 #endif // __UNIX__
 }
 
 #endif // __UNIX__

+
+#ifdef GDK_WINDOWING_BROADWAY
+
+bool wxLaunchDefaultApplication(const wxString& document, int flags)
+{
+    return false;
+}
+
+bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
+{
+    return false;
+}
+
+#endif

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 36344c4139d73a4c4b3fd49aaadb4e4ed9be13ab..71f22ac87967ecd059e4c8096bbda395850b3f7f 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2143,7 +2143,7 @@ wxWindow *wxGetActiveWindow()
 
 // Under Unix this is implemented using X11 functions in utilsx11.cpp but we
 // need to have this function under Windows too, so provide at least a stub.
 
 // Under Unix this is implemented using X11 functions in utilsx11.cpp but we
 // need to have this function under Windows too, so provide at least a stub.

-#ifdef __WINDOWS__
+#ifndef GDK_WINDOWING_X11

 bool wxGetKeyState(wxKeyCode WXUNUSED(key))
 {
     wxFAIL_MSG(wxS("Not implemented under Windows"));
 bool wxGetKeyState(wxKeyCode WXUNUSED(key))
 {
     wxFAIL_MSG(wxS("Not implemented under Windows"));

diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp
index 04c5f86218d81035cfd8b57cc03e96fdc9dc4da8..6f97e92717412602f475706e159ee1c8863383f5 100644 (file)
--- a/src/unix/displayx11.cpp
+++ b/src/unix/displayx11.cpp
@@ -382,7 +382,7 @@ bool wxDisplayImplX11::ChangeMode(const wxVideoMode& WXUNUSED(mode))
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

-#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
+#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 || !defined(GDK_WINDOWING_X11)

 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {
 
 void wxClientDisplayRect(int *x, int *y, int *width, int *height)
 {

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index ef81b9022c06298b5d639e848bce3e37356944cc..b111e2b9cdca35812416f53e71ab554aad7aab47 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -38,8 +38,13 @@
 
 #ifdef __WXGTK__
 #include <gdk/gdk.h>
 
 #ifdef __WXGTK__
 #include <gdk/gdk.h>

+#ifdef GDK_WINDOWING_X11

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

+#endif
+
+// Only X11 backend is supported for wxGTK here
+#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)

 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;
 
 // Various X11 Atoms used in this file:
 static Atom _NET_WM_STATE = 0;


@@ -925,4 +930,6 @@ bool wxDoLaunchDefaultBrowser(const wxString& url, int flags)
     return false;
 }
 
     return false;
 }
 

+#endif // !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
+

 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__
 #endif // __WXX11__ || __WXGTK__ || __WXMOTIF__