Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New "pizza" widget implementation. Window border widths now match the GtkStyle they are drawn with.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-11-06 18:14:15 +00:00
parent 1ca1b2b88f
commit 08f53168ac
17 changed files with 183 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/unix/mediactrl.cpp
View File

@@ -37,7 +37,7 @@
#include "wx/thread.h" // wxMutex/wxMutexLocker
#ifdef __WXGTK__
# include "wx/gtk/win_gtk.h"
#include <gtk/gtk.h>
# include <gdk/gdkx.h> // for GDK_WINDOW_XWINDOW
#endif
@@ -282,7 +282,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
if(event->count > 0)
return FALSE;
GdkWindow *window = GTK_PIZZA(be->GetControl()->m_wxwindow)->bin_window;
GdkWindow *window = be->GetControl()->GTKGetDrawingWindow();
// I've seen this reccommended somewhere...
// TODO: Is this needed? Maybe it is just cruft...
@@ -320,7 +320,7 @@ static gboolean gtk_window_expose_callback(GtkWidget *widget,
//-----------------------------------------------------------------------------
#ifdef __WXGTK__
extern "C" {
static gint gtk_window_realize_callback(GtkWidget* theWidget,
static gint gtk_window_realize_callback(GtkWidget*,
wxGStreamerMediaBackend* be)
{
DEBUG_MAIN_THREAD // TODO: Is this neccessary?
@@ -333,7 +333,7 @@ static gint gtk_window_realize_callback(GtkWidget* theWidget,
wxYield(); // FIXME: RN: X Server gets an error/crash if I don't do
// this or a messagebox beforehand?!?!??
GdkWindow *window = GTK_PIZZA(theWidget)->bin_window;
GdkWindow *window = be->GetControl()->GTKGetDrawingWindow();
wxASSERT(window);
gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),
@@ -737,7 +737,7 @@ void wxGStreamerMediaBackend::SetupXOverlay()
else
{
wxYield(); // see realize callback...
GdkWindow *window = GTK_PIZZA(m_ctrl->m_wxwindow)->bin_window;
GdkWindow *window = m_ctrl->m_wxwindow->GTKGetDrawingWindow();
wxASSERT(window);
#endif