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
This commit is contained in:
@@ -531,6 +531,10 @@ All (GUI):
|
|||||||
- Add possibility to hide and show again wxRibbonBar pages (wxBen).
|
- Add possibility to hide and show again wxRibbonBar pages (wxBen).
|
||||||
- Fix item data access in wxDataViewListCtrl (Kry).
|
- 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)
|
||||||
------
|
------
|
||||||
|
@@ -96,7 +96,11 @@ bool wxNativeContainerWindow::Create(wxNativeContainerWindowId anid)
|
|||||||
{
|
{
|
||||||
bool rc;
|
bool rc;
|
||||||
#ifdef __WXGTK3__
|
#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
|
#else
|
||||||
GdkWindow * const win = gdk_window_foreign_new(anid);
|
GdkWindow * const win = gdk_window_foreign_new(anid);
|
||||||
#endif
|
#endif
|
||||||
|
@@ -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
|
||||||
|
@@ -2143,7 +2143,7 @@ wxWindow *wxGetActiveWindow()
|
|||||||
|
|
||||||
// Under Unix this is implemented using X11 functions in utilsx11.cpp but we
|
// 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.
|
// 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))
|
bool wxGetKeyState(wxKeyCode WXUNUSED(key))
|
||||||
{
|
{
|
||||||
wxFAIL_MSG(wxS("Not implemented under Windows"));
|
wxFAIL_MSG(wxS("Not implemented under Windows"));
|
||||||
|
@@ -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)
|
||||||
{
|
{
|
||||||
|
@@ -38,8 +38,13 @@
|
|||||||
|
|
||||||
#ifdef __WXGTK__
|
#ifdef __WXGTK__
|
||||||
#include <gdk/gdk.h>
|
#include <gdk/gdk.h>
|
||||||
|
#ifdef GDK_WINDOWING_X11
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Only X11 backend is supported for wxGTK here
|
||||||
|
#if !defined(__WXGTK__) || defined(GDK_WINDOWING_X11)
|
||||||
|
|
||||||
// Various X11 Atoms used in this file:
|
// Various X11 Atoms used in this file:
|
||||||
static Atom _NET_WM_STATE = 0;
|
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__
|
||||||
|
Reference in New Issue
Block a user