/////////////////////////////////////////////////////////////////////////////
// Name: src/gtk/window.cpp
-// Purpose:
+// Purpose: wxWindowGTK implementation
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling, Julian Smart
#include "wx/gtk/private.h"
#include "wx/gtk/private/win_gtk.h"
-#include <gdk/gdkkeysyms.h>
+
#include <gdk/gdkx.h>
+#include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif
+
+#if !GTK_CHECK_VERSION(2,10,0)
+ // GTK+ can reliably detect Meta key state only since 2.10 when
+ // GDK_META_MASK was introduced -- there wasn't any way to detect it
+ // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but
+ // GDK_MOD2_MASK is documented as:
+ //
+ // the fifth modifier key (it depends on the modifier mapping of the X
+ // server which key is interpreted as this modifier)
+ //
+ // In other words, it isn't guaranteed to map to Meta. This is a real
+ // problem: it is common to map NumLock to it (in fact, it's an exception
+ // if the X server _doesn't_ use it for NumLock). So the old code caused
+ // wxKeyEvent::MetaDown() to always return true as long as NumLock was on
+ // on many systems, which broke all applications using
+ // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here:
+ // http://tinyurl.com/56lsk2).
+ //
+ // Because of this, it's better to not detect Meta key state at all than
+ // to detect it incorrectly. Hence the following #define, which causes
+ // m_metaDown to be always set to false.
+ #define GDK_META_MASK 0
+#endif
+
//-----------------------------------------------------------------------------
// documentation on internals
//-----------------------------------------------------------------------------
Cursors, too, have been a constant source of pleasure. The main difficulty
is that a GdkWindow inherits a cursor if the programmer sets a new cursor
- for the parent. To prevent this from doing too much harm, I use idle time
- to set the cursor over and over again, starting from the toplevel windows
- and ending with the youngest generation (speaking of parent and child windows).
+ for the parent. To prevent this from doing too much harm, SetCursor calls
+ GTKUpdateCursor, which will recursively re-set the cursors of all child windows.
Also don't forget that cursors (like much else) are connected to GdkWindows,
not GtkWidgets and that the "window" field of a GtkWidget might very well
point to the GdkWindow of the parent widget (-> "window-less widget") and
that the two obviously have very different meanings.
-
*/
//-----------------------------------------------------------------------------
// mouse capture state: the window which has it and if the mouse is currently
// inside it
-static wxWindowGTK *g_captureWindow = (wxWindowGTK*) NULL;
+static wxWindowGTK *g_captureWindow = NULL;
static bool g_captureWindowHasMouse = false;
// The window that currently has focus:
// global variables because GTK+ DnD want to have the
// mouse event that caused it
-GdkEvent *g_lastMouseEvent = (GdkEvent*) NULL;
+GdkEvent *g_lastMouseEvent = NULL;
int g_lastButtonNumber = 0;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// the trace mask used for the focus debugging messages
-#define TRACE_FOCUS _T("focus")
+#define TRACE_FOCUS wxT("focus")
//-----------------------------------------------------------------------------
// missing gdk functions
// "size_request" of m_widget
//-----------------------------------------------------------------------------
-// make it extern because wxStaticText needs to disconnect this one
extern "C" {
-void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
- GtkRequisition *requisition,
- wxWindow * win)
+static void
+wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
+ GtkRequisition *requisition,
+ wxWindow * win)
{
int w, h;
win->GetSize( &w, &h );
extern "C" {
static gboolean
-gtk_window_expose_callback( GtkWidget* widget,
+gtk_window_expose_callback( GtkWidget*,
GdkEventExpose *gdk_event,
wxWindow *win )
{
- if (gdk_event->window == widget->window)
+ if (gdk_event->window == win->GTKGetDrawingWindow())
{
win->GetUpdateRegion() = wxRegion( gdk_event->region );
win->GtkSendPaintEvents();
}
}
+#ifndef __WXUNIVERSAL__
//-----------------------------------------------------------------------------
-// "expose_event" from m_widget, for drawing border
+// "expose_event" from m_wxwindow->parent, for drawing border
//-----------------------------------------------------------------------------
-#ifndef __WXUNIVERSAL__
-
-GtkWidget* GetEntryWidget();
-
extern "C" {
static gboolean
expose_event_border(GtkWidget* widget, GdkEventExpose* gdk_event, wxWindow* win)
{
- // if this event is not for the GdkWindow the border is drawn on
- if (win->m_wxwindow == win->m_widget && gdk_event->window == widget->window)
+ if (gdk_event->window != gtk_widget_get_parent_window(win->m_wxwindow))
+ return false;
+
+ if (!win->IsShown())
+ return false;
+
+ GtkAllocation alloc;
+ gtk_widget_get_allocation(win->m_wxwindow, &alloc);
+ const int x = alloc.x;
+ const int y = alloc.y;
+ const int w = alloc.width;
+ const int h = alloc.height;
+
+ if (w <= 0 || h <= 0)
return false;
- int x = 0;
- int y = 0;
- // GtkScrolledWindow is GTK_NO_WINDOW
- if (GTK_WIDGET_NO_WINDOW(widget))
- {
- x = widget->allocation.x;
- y = widget->allocation.y;
- }
- int w = win->m_wxwindow->allocation.width;
- int h = win->m_wxwindow->allocation.height;
if (win->HasFlag(wxBORDER_SIMPLE))
{
- GdkGC* gc = gdk_gc_new(gdk_event->window);
- gdk_gc_set_foreground(gc, &widget->style->black);
- gdk_draw_rectangle(gdk_event->window, gc, false, x, y, w - 1, h - 1);
- g_object_unref(gc);
+ gdk_draw_rectangle(gdk_event->window,
+ gtk_widget_get_style(widget)->black_gc, false, x, y, w - 1, h - 1);
}
else
{
// Style detail to use
const char* detail;
- if (widget == win->m_wxwindow)
+ if (win->m_widget == win->m_wxwindow)
// for non-scrollable wxWindows
detail = "entry";
else
// for scrollable ones
detail = "viewport";
- GtkWidget* styleWidget = GetEntryWidget();
+ // clip rect is required to avoid painting background
+ // over upper left (w,h) of parent window
+ GdkRectangle clipRect = { x, y, w, h };
gtk_paint_shadow(
- styleWidget->style, gdk_event->window, GTK_STATE_NORMAL,
- shadow, NULL, styleWidget, detail, x, y, w, h);
+ gtk_widget_get_style(win->m_wxwindow), gdk_event->window, GTK_STATE_NORMAL,
+ shadow, &clipRect, wxGTKPrivate::GetEntryWidget(), detail, x, y, w, h);
}
+ return false;
+}
+}
- // no further painting is needed for border-only GdkWindow
- return win->m_wxwindow == win->m_widget;
+//-----------------------------------------------------------------------------
+// "parent_set" from m_wxwindow
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static void
+parent_set(GtkWidget* widget, GtkObject* old_parent, wxWindow* win)
+{
+ if (old_parent)
+ {
+ g_signal_handlers_disconnect_by_func(
+ old_parent, (void*)expose_event_border, win);
+ }
+ GtkWidget* parent = gtk_widget_get_parent(widget);
+ if (parent)
+ {
+ g_signal_connect_after(parent, "expose_event",
+ G_CALLBACK(expose_event_border), win);
+ }
}
}
#endif // !__WXUNIVERSAL__
// set WXTRACE to this to see the key event codes on the console
-#define TRACE_KEYS _T("keyevent")
+#define TRACE_KEYS wxT("keyevent")
// translates an X key symbol to WXK_XXX value
//
event.SetTimestamp( gdk_event->time );
event.SetId(win->GetId());
+
event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0;
event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
- event.m_metaDown = (gdk_event->state & GDK_MOD2_MASK) != 0;
- event.m_scanCode = gdk_event->keyval;
+ event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0;
+
+ // Normally we take the state of modifiers directly from the low level GDK
+ // event but unfortunately GDK uses a different convention from MSW for the
+ // key events corresponding to the modifier keys themselves: in it, when
+ // e.g. Shift key is pressed, GDK_SHIFT_MASK is not set while it is set
+ // when Shift is released. Under MSW the situation is exactly reversed and
+ // the modifier corresponding to the key is set when it is pressed and
+ // unset when it is released. To ensure consistent behaviour between
+ // platforms (and because it seems to make slightly more sense, although
+ // arguably both behaviours are reasonable) we follow MSW here.
+ //
+ // Final notice: we set the flags to the desired value instead of just
+ // inverting them because they are not set correctly (i.e. in the same way
+ // as for the real events generated by the user) for wxUIActionSimulator-
+ // produced events and it seems better to keep that class code the same
+ // among all platforms and fix the discrepancy here instead of adding
+ // wxGTK-specific code to wxUIActionSimulator.
+ const bool isPress = gdk_event->type == GDK_KEY_PRESS;
+ switch ( gdk_event->keyval )
+ {
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ event.m_shiftDown = isPress;
+ break;
+
+ case GDK_Control_L:
+ case GDK_Control_R:
+ event.m_controlDown = isPress;
+ break;
+
+ case GDK_Alt_L:
+ case GDK_Alt_R:
+ event.m_altDown = isPress;
+ break;
+
+ case GDK_Meta_L:
+ case GDK_Meta_R:
+ case GDK_Super_L:
+ case GDK_Super_R:
+ event.m_metaDown = isPress;
+ break;
+ }
+
event.m_rawCode = (wxUint32) gdk_event->keyval;
- event.m_rawFlags = 0;
-#if wxUSE_UNICODE
- event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
-#endif
+ event.m_rawFlags = gdk_event->hardware_keycode;
+
wxGetMousePosition( &x, &y );
win->ScreenToClient( &x, &y );
event.m_x = x;
KeySym keysym = gdk_event->keyval;
- wxLogTrace(TRACE_KEYS, _T("Key %s event: keysym = %ld"),
- event.GetEventType() == wxEVT_KEY_UP ? _T("release")
- : _T("press"),
+ wxLogTrace(TRACE_KEYS, wxT("Key %s event: keysym = %ld"),
+ event.GetEventType() == wxEVT_KEY_UP ? wxT("release")
+ : wxT("press"),
keysym);
long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */);
Display *dpy = (Display *)wxGetDisplay();
KeyCode keycode = XKeysymToKeycode(dpy, keysym);
- wxLogTrace(TRACE_KEYS, _T("\t-> keycode %d"), keycode);
+ wxLogTrace(TRACE_KEYS, wxT("\t-> keycode %d"), keycode);
KeySym keysymNormalized = XKeycodeToKeysym(dpy, keycode, 0);
}
}
- wxLogTrace(TRACE_KEYS, _T("\t-> wxKeyCode %ld"), key_code);
+ wxLogTrace(TRACE_KEYS, wxT("\t-> wxKeyCode %ld"), key_code);
// sending unknown key events doesn't really make sense
if ( !key_code )
return false;
- // now fill all the other fields
- wxFillOtherKeyEventFields(event, win, gdk_event);
-
event.m_keyCode = key_code;
+
#if wxUSE_UNICODE
- if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE )
+ event.m_uniChar = gdk_keyval_to_unicode(key_code ? key_code : keysym);
+ if ( !event.m_uniChar && event.m_keyCode <= WXK_DELETE )
{
- event.m_uniChar = key_code;
+ // Set Unicode key code to the ASCII equivalent for compatibility. E.g.
+ // let RETURN generate the key event with both key and Unicode key
+ // codes of 13.
+ event.m_uniChar = event.m_keyCode;
}
-#endif
+#endif // wxUSE_UNICODE
+
+ // now fill all the other fields
+ wxFillOtherKeyEventFields(event, win, gdk_event);
return true;
}
}
};
+namespace
+{
+
+// Send wxEVT_CHAR_HOOK event to the parent of the window and if it wasn't
+// processed, send wxEVT_CHAR to the window itself. Return true if either of
+// them was handled.
+bool
+SendCharHookAndCharEvents(const wxKeyEvent& event, wxWindow *win)
+{
+ // wxEVT_CHAR_HOOK must be sent to the top level parent window to allow it
+ // to handle key events in all of its children unless the mouse is captured
+ // in which case we consider that the keyboard should be "captured" too.
+ if ( !g_captureWindow )
+ {
+ wxWindow * const parent = wxGetTopLevelParent(win);
+ if ( parent )
+ {
+ // We need to make a copy of the event object because it is
+ // modified while it's handled, notably its WasProcessed() flag
+ // is set after it had been processed once.
+ wxKeyEvent eventCharHook(event);
+ eventCharHook.SetEventType(wxEVT_CHAR_HOOK);
+ if ( parent->HandleWindowEvent(eventCharHook) )
+ return true;
+ }
+ }
+
+ // As above, make a copy of the event first.
+ wxKeyEvent eventChar(event);
+ eventChar.SetEventType(wxEVT_CHAR);
+ return win->HandleWindowEvent(eventChar);
+}
+
+} // anonymous namespace
+
extern "C" {
static gboolean
-gtk_window_key_press_callback( GtkWidget *widget,
+gtk_window_key_press_callback( GtkWidget *WXUNUSED(widget),
GdkEventKey *gdk_event,
wxWindow *win )
{
if (g_blockEventsOnDrag)
return FALSE;
- // GTK+ sends keypress events to the focus widget and then
- // to all its parent and grandparent widget. We only want
- // the key events from the focus widget.
- if (!GTK_WIDGET_HAS_FOCUS(widget))
- return FALSE;
-
wxKeyEvent event( wxEVT_KEY_DOWN );
bool ret = false;
bool return_after_IM = false;
return_after_IM = true;
}
- if ((!ret) && (win->m_imData != NULL))
+ if (!ret && win->m_imData)
{
+ win->m_imData->lastKeyEvent = gdk_event;
+
// We should let GTK+ IM filter key event first. According to GTK+ 2.0 API
// docs, if IM filter returns true, no further processing should be done.
// we should send the key_down event anyway.
win->m_imData->lastKeyEvent = NULL;
if (intercepted_by_IM)
{
- wxLogTrace(TRACE_KEYS, _T("Key event intercepted by IM"));
+ wxLogTrace(TRACE_KEYS, wxT("Key event intercepted by IM"));
return TRUE;
}
}
if ( key_code )
{
- wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code);
+ wxLogTrace(TRACE_KEYS, wxT("Char event: %ld"), key_code);
event.m_keyCode = key_code;
#endif
}
- // Implement OnCharHook by checking ancestor top level windows
- wxWindow *parent = win;
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
- if (parent)
- {
- event.SetEventType( wxEVT_CHAR_HOOK );
- ret = parent->HandleWindowEvent( event );
- }
-
- if (!ret)
- {
- event.SetEventType(wxEVT_CHAR);
- ret = win->HandleWindowEvent( event );
- }
+ ret = SendCharHookAndCharEvents(event, win);
}
}
if( data.empty() )
return;
- bool ret = false;
-
- // Implement OnCharHook by checking ancestor top level windows
- wxWindow *parent = window;
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
-
for( wxString::const_iterator pstr = data.begin(); pstr != data.end(); ++pstr )
{
#if wxUSE_UNICODE
event.m_uniChar = *pstr;
// Backward compatible for ISO-8859-1
event.m_keyCode = *pstr < 256 ? event.m_uniChar : 0;
- wxLogTrace(TRACE_KEYS, _T("IM sent character '%c'"), event.m_uniChar);
+ wxLogTrace(TRACE_KEYS, wxT("IM sent character '%c'"), event.m_uniChar);
#else
event.m_keyCode = (char)*pstr;
#endif // wxUSE_UNICODE
#endif
}
- if (parent)
- {
- event.SetEventType( wxEVT_CHAR_HOOK );
- ret = parent->HandleWindowEvent( event );
- }
-
- if (!ret)
- {
- event.SetEventType(wxEVT_CHAR);
- ret = window->HandleWindowEvent( event );
- }
+ SendCharHookAndCharEvents(event, window);
}
}
}
T *gdk_event)
{
event.SetTimestamp( gdk_event->time );
- event.m_shiftDown = gdk_event->state & GDK_SHIFT_MASK;
- event.m_controlDown = gdk_event->state & GDK_CONTROL_MASK;
- event.m_altDown = gdk_event->state & GDK_MOD1_MASK;
- event.m_metaDown = gdk_event->state & GDK_MOD2_MASK;
- event.m_leftDown = gdk_event->state & GDK_BUTTON1_MASK;
- event.m_middleDown = gdk_event->state & GDK_BUTTON2_MASK;
- event.m_rightDown = gdk_event->state & GDK_BUTTON3_MASK;
- event.m_aux1Down = gdk_event->state & GDK_BUTTON4_MASK;
- event.m_aux2Down = gdk_event->state & GDK_BUTTON5_MASK;
+ event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0;
+ event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0;
+ event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0;
+ event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0;
+ event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0;
+ event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0;
+ event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0;
+
+ // In gdk/win32 VK_XBUTTON1 is translated to GDK_BUTTON4_MASK
+ // and VK_XBUTTON2 to GDK_BUTTON5_MASK. In x11/gdk buttons 4/5
+ // are wheel rotation and buttons 8/9 don't change the state.
+ event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0;
+ event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0;
wxPoint pt = win->GetClientAreaOrigin();
event.m_x = (wxCoord)gdk_event->x - pt.x;
if ((win->m_wxwindow) && (win->GetLayoutDirection() == wxLayout_RightToLeft))
{
// origin in the upper right corner
- int window_width = win->m_wxwindow->allocation.width;
+ GtkAllocation a;
+ gtk_widget_get_allocation(win->m_wxwindow, &a);
+ int window_width = a.width;
event.m_x = window_width - event.m_x;
}
event.m_rightDown = !event.m_rightDown;
return;
}
+
+ if ((event.GetEventType() == wxEVT_AUX1_DOWN) ||
+ (event.GetEventType() == wxEVT_AUX1_DCLICK))
+ {
+ event.m_aux1Down = true;
+ return;
+ }
+
+ if ((event.GetEventType() == wxEVT_AUX2_DOWN) ||
+ (event.GetEventType() == wxEVT_AUX2_DCLICK))
+ {
+ event.m_aux2Down = true;
+ return;
+ }
}
// find the window to send the mouse event too
if (!child->IsShown())
continue;
- if (child->IsTransparentForMouse())
+ if (child->GTKIsTransparentForMouse())
{
// wxStaticBox is transparent in the box itself
int xx1 = child->m_x;
}
else
{
- if ((child->m_wxwindow == (GtkWidget*) NULL) &&
+ if ((child->m_wxwindow == NULL) &&
(child->m_x <= xx) &&
(child->m_y <= yy) &&
(child->m_x+child->m_width >= xx) &&
return HandleWindowEvent(event);
}
+bool wxWindowGTK::GTKShouldIgnoreEvent() const
+{
+ return !m_hasVMT || g_blockEventsOnDrag;
+}
+
int wxWindowGTK::GTKCallbackCommonPrologue(GdkEventAny *event) const
{
if (!m_hasVMT)
}
}
+ else if (gdk_event->button == 8)
+ {
+ switch (gdk_event->type)
+ {
+ case GDK_3BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
+ event_type = wxEVT_AUX1_DOWN;
+ break;
+
+ case GDK_2BUTTON_PRESS:
+ event_type = wxEVT_AUX1_DCLICK;
+ break;
+
+ default:
+ ;
+ }
+ }
+
+ else if (gdk_event->button == 9)
+ {
+ switch (gdk_event->type)
+ {
+ case GDK_3BUTTON_PRESS:
+ case GDK_BUTTON_PRESS:
+ event_type = wxEVT_AUX2_DOWN;
+ break;
+
+ case GDK_2BUTTON_PRESS:
+ event_type = wxEVT_AUX2_DCLICK;
+ break;
+
+ default:
+ ;
+ }
+ }
+
if ( event_type == wxEVT_NULL )
{
// unknown mouse button or click type
AdjustEventButtonState(event);
- // wxListBox actually gets mouse events from the item, so we need to give it
- // a chance to correct this
- win->FixUpMouseEvent(widget, event.m_x, event.m_y);
-
// find the correct window to send the event to: it may be a different one
// from the one which got it at GTK+ level because some controls don't have
// their own X window and thus cannot get any events.
//-----------------------------------------------------------------------------
static gboolean
-gtk_window_button_release_callback( GtkWidget *widget,
+gtk_window_button_release_callback( GtkWidget *WXUNUSED(widget),
GdkEventButton *gdk_event,
wxWindowGTK *win )
{
event_type = wxEVT_RIGHT_UP;
break;
+ case 8:
+ event_type = wxEVT_AUX1_UP;
+ break;
+
+ case 9:
+ event_type = wxEVT_AUX2_UP;
+ break;
+
default:
// unknown button, don't process
return FALSE;
AdjustEventButtonState(event);
- // same wxListBox hack as above
- win->FixUpMouseEvent(widget, event.m_x, event.m_y);
-
if ( !g_captureWindow )
win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
// "scroll_event" (mouse wheel event)
//-----------------------------------------------------------------------------
+static gboolean
+window_scroll_event_hscrollbar(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
+{
+ if (gdk_event->direction != GDK_SCROLL_LEFT &&
+ gdk_event->direction != GDK_SCROLL_RIGHT)
+ {
+ return false;
+ }
+
+ GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Horz];
+
+ if (range && gtk_widget_get_visible(GTK_WIDGET(range)))
+ {
+ GtkAdjustment* adj = gtk_range_get_adjustment(range);
+ double delta = gtk_adjustment_get_step_increment(adj) * 3;
+ if (gdk_event->direction == GDK_SCROLL_LEFT)
+ delta = -delta;
+
+ gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta);
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static gboolean
window_scroll_event(GtkWidget*, GdkEventScroll* gdk_event, wxWindow* win)
{
else
event.m_wheelRotation = -120;
- return win->GTKProcessEvent(event);
+ if (win->GTKProcessEvent(event))
+ return TRUE;
+
+ GtkRange *range = win->m_scrollBar[wxWindow::ScrollDir_Vert];
+
+ if (range && gtk_widget_get_visible(GTK_WIDGET(range)))
+ {
+ GtkAdjustment* adj = gtk_range_get_adjustment(range);
+ double delta = gtk_adjustment_get_step_increment(adj) * 3;
+ if (gdk_event->direction == GDK_SCROLL_UP)
+ delta = -delta;
+
+ gtk_range_set_value(range, gtk_adjustment_get_value(adj) + delta);
+
+ return TRUE;
+ }
+
+ return FALSE;
}
//-----------------------------------------------------------------------------
int y = 0;
GdkModifierType state = (GdkModifierType)0;
- gdk_window_get_pointer( widget->window, &x, &y, &state );
+ gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state);
wxMouseEvent event( wxEVT_ENTER_WINDOW );
InitMouseEvent(win, event, gdk_event);
int y = 0;
GdkModifierType state = (GdkModifierType)0;
- gdk_window_get_pointer( widget->window, &x, &y, &state );
+ gdk_window_get_pointer(gtk_widget_get_window(widget), &x, &y, &state);
InitMouseEvent(win, event, gdk_event);
static void
gtk_scrollbar_value_changed(GtkRange* range, wxWindow* win)
{
- wxEventType eventType = win->GetScrollEventType(range);
+ wxEventType eventType = win->GTKGetScrollEventType(range);
if (eventType != wxEVT_NULL)
{
// Convert scroll event type to scrollwin event type
if (win->m_imData)
{
gtk_im_context_set_client_window( win->m_imData->context,
- widget->window);
+ win->m_wxwindow ? win->GTKGetDrawingWindow() : gtk_widget_get_window(widget));
}
// We cannot set colours and fonts before the widget
wxWindowCreateEvent event( win );
event.SetEventObject( win );
win->GTKProcessEvent( event );
+
+ win->GTKUpdateCursor(true, false);
}
//-----------------------------------------------------------------------------
win->m_oldClientHeight = h;
// this callback can be connected to m_wxwindow,
// so always get size from m_widget->allocation
- win->m_width = win->m_widget->allocation.width;
- win->m_height = win->m_widget->allocation.height;
+ GtkAllocation a;
+ gtk_widget_get_allocation(win->m_widget, &a);
+ win->m_width = a.width;
+ win->m_height = a.height;
if (!win->m_nativeSizeEvent)
{
wxSizeEvent event(win->GetSize(), win->GetId());
} // extern "C"
-// Helper to suspend colour change event event processing while we change a widget's style
-class wxSuspendStyleEvents
-{
-public:
- wxSuspendStyleEvents(wxWindow* win)
- {
- m_win = NULL;
- if (win->m_wxwindow && win->IsTopLevel())
- {
- m_win = win;
- g_signal_handlers_block_by_func(
- m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win);
- }
- }
- ~wxSuspendStyleEvents()
- {
- if (m_win)
- g_signal_handlers_unblock_by_func(
- m_win->m_wxwindow, (void*)gtk_window_style_set_callback, m_win);
- }
-
- wxWindow* m_win;
-};
-
// ----------------------------------------------------------------------------
// this wxWindowBase function is implemented here (in platform-specific file)
// because it is static and so couldn't be made virtual
{
wxWindowGTK *focus = gs_pendingFocus ? gs_pendingFocus : gs_currentFocus;
// the cast is necessary when we compile in wxUniversal mode
- return wx_static_cast(wxWindow*, focus);
+ return static_cast<wxWindow*>(focus);
}
-//-----------------------------------------------------------------------------
-// InsertChild for wxWindowGTK.
-//-----------------------------------------------------------------------------
-
-/* Callback for wxWindowGTK. This very strange beast has to be used because
- * C++ has no virtual methods in a constructor. We have to emulate a
- * virtual function here as wxNotebook requires a different way to insert
- * a child in it. I had opted for creating a wxNotebookPage window class
- * which would have made this superfluous (such in the MDI window system),
- * but no-one was listening to me... */
-
-static void wxInsertChildInWindow( wxWindowGTK* parent, wxWindowGTK* child )
+void wxWindowGTK::AddChildGTK(wxWindowGTK* child)
{
- /* the window might have been scrolled already, do we
- have to adapt the position */
- wxPizza* pizza = WX_PIZZA(parent->m_wxwindow);
+ wxASSERT_MSG(m_wxwindow, "Cannot add a child to a window without a client area");
+
+ // the window might have been scrolled already, we
+ // have to adapt the position
+ wxPizza* pizza = WX_PIZZA(m_wxwindow);
child->m_x += pizza->m_scroll_x;
child->m_y += pizza->m_scroll_y;
gtk_widget_set_size_request(
child->m_widget, child->m_width, child->m_height);
- gtk_fixed_put(
- GTK_FIXED(parent->m_wxwindow), child->m_widget, child->m_x, child->m_y);
+ pizza->put(child->m_widget, child->m_x, child->m_y);
}
//-----------------------------------------------------------------------------
ms.SetX(x);
ms.SetY(y);
- ms.SetLeftDown(mask & GDK_BUTTON1_MASK);
- ms.SetMiddleDown(mask & GDK_BUTTON2_MASK);
- ms.SetRightDown(mask & GDK_BUTTON3_MASK);
- ms.SetAux1Down(mask & GDK_BUTTON4_MASK);
- ms.SetAux2Down(mask & GDK_BUTTON5_MASK);
-
- ms.SetControlDown(mask & GDK_CONTROL_MASK);
- ms.SetShiftDown(mask & GDK_SHIFT_MASK);
- ms.SetAltDown(mask & GDK_MOD1_MASK);
- ms.SetMetaDown(mask & GDK_MOD2_MASK);
+ ms.SetLeftDown((mask & GDK_BUTTON1_MASK) != 0);
+ ms.SetMiddleDown((mask & GDK_BUTTON2_MASK) != 0);
+ ms.SetRightDown((mask & GDK_BUTTON3_MASK) != 0);
+ // see the comment in InitMouseEvent()
+ ms.SetAux1Down((mask & GDK_BUTTON4_MASK) != 0);
+ ms.SetAux2Down((mask & GDK_BUTTON5_MASK) != 0);
+
+ ms.SetControlDown((mask & GDK_CONTROL_MASK) != 0);
+ ms.SetShiftDown((mask & GDK_SHIFT_MASK) != 0);
+ ms.SetAltDown((mask & GDK_MOD1_MASK) != 0);
+ ms.SetMetaDown((mask & GDK_META_MASK) != 0);
return ms;
}
// method
#ifdef __WXUNIVERSAL__
IMPLEMENT_ABSTRACT_CLASS(wxWindowGTK, wxWindowBase)
-#else // __WXGTK__
- IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxWindowBase)
-#endif // __WXUNIVERSAL__/__WXGTK__
+#endif // __WXUNIVERSAL__
void wxWindowGTK::Init()
{
// GTK specific
- m_widget = (GtkWidget *) NULL;
- m_wxwindow = (GtkWidget *) NULL;
- m_focusWidget = (GtkWidget *) NULL;
+ m_widget = NULL;
+ m_wxwindow = NULL;
+ m_focusWidget = NULL;
// position/size
m_x = 0;
m_height = 0;
m_hasVMT = false;
- m_isBeingDeleted = false;
- m_showOnIdle= false;
+ m_showOnIdle = false;
m_noExpose = false;
m_nativeSizeEvent = false;
m_oldClientWidth =
m_oldClientHeight = 0;
- m_insertCallback = wxInsertChildInWindow;
-
m_clipPaintRegion = false;
m_needsStyleChange = false;
{
// Get default border
wxBorder border = GetBorder(style);
+
style &= ~wxBORDER_MASK;
style |= border;
return false;
}
+ // We should accept the native look
+#if 0
+ GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
+ scroll_class->scrollbar_spacing = 0;
+#endif
+
m_wxwindow = wxPizza::New(m_windowStyle);
+#ifndef __WXUNIVERSAL__
+ if (HasFlag(wxPizza::BORDER_STYLES))
+ {
+ g_signal_connect(m_wxwindow, "parent_set",
+ G_CALLBACK(parent_set), this);
+ }
+#endif
if (!HasFlag(wxHSCROLL) && !HasFlag(wxVSCROLL))
m_widget = m_wxwindow;
else
{
- m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
+ m_widget = gtk_scrolled_window_new( NULL, NULL );
GtkScrolledWindow *scrolledWindow = GTK_SCROLLED_WINDOW(m_widget);
- GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
- scroll_class->scrollbar_spacing = 0;
-
// There is a conflict with default bindings at GTK+
// level between scrolled windows and notebooks both of which want to use
// Ctrl-PageUp/Down: scrolled windows for scrolling in the horizontal
if (HasFlag(wxALWAYS_SHOW_SB))
{
gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS );
-
- scrolledWindow->hscrollbar_visible = TRUE;
- scrolledWindow->vscrollbar_visible = TRUE;
}
else
{
gtk_scrolled_window_set_policy( scrolledWindow, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
}
- m_scrollBar[ScrollDir_Horz] = GTK_RANGE(scrolledWindow->hscrollbar);
- m_scrollBar[ScrollDir_Vert] = GTK_RANGE(scrolledWindow->vscrollbar);
+ m_scrollBar[ScrollDir_Horz] = GTK_RANGE(gtk_scrolled_window_get_hscrollbar(scrolledWindow));
+ m_scrollBar[ScrollDir_Vert] = GTK_RANGE(gtk_scrolled_window_get_vscrollbar(scrolledWindow));
if (GetLayoutDirection() == wxLayout_RightToLeft)
gtk_range_set_inverted( m_scrollBar[ScrollDir_Horz], TRUE );
gtk_widget_show( m_wxwindow );
}
+ g_object_ref(m_widget);
if (m_parent)
m_parent->DoAddChild( this );
if ( gs_deferredFocusOut == this )
gs_deferredFocusOut = NULL;
- m_isBeingDeleted = true;
m_hasVMT = false;
// destroy children before destroying this window itself
// delete before the widgets to avoid a crash on solaris
delete m_imData;
- if (m_wxwindow && (m_wxwindow != m_widget))
- {
- gtk_widget_destroy( m_wxwindow );
- m_wxwindow = (GtkWidget*) NULL;
- }
+ // avoid problem with GTK+ 2.18 where a frozen window causes the whole
+ // TLW to be frozen, and if the window is then destroyed, nothing ever
+ // gets painted again
+ if (IsFrozen())
+ DoThaw();
if (m_widget)
{
- gtk_widget_destroy( m_widget );
- m_widget = (GtkWidget*) NULL;
+ // Note that gtk_widget_destroy() does not destroy the widget, it just
+ // emits the "destroy" signal. The widget is not actually destroyed
+ // until its reference count drops to zero.
+ gtk_widget_destroy(m_widget);
+ // Release our reference, should be the last one
+ g_object_unref(m_widget);
+ m_widget = NULL;
}
+ m_wxwindow = NULL;
}
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )
g_signal_connect (m_imData->context, "commit",
G_CALLBACK (gtk_wxwindow_commit_cb), this);
-
- // border drawing
-#ifndef __WXUNIVERSAL__
- if (HasFlag(wxPizza::BORDER_STYLES))
- {
- g_signal_connect(m_widget, "expose_event",
- G_CALLBACK(expose_event_border), this);
- }
-#endif
}
// focus handling
G_CALLBACK(size_allocate), this);
}
- if (m_wxwindow)
- {
#if GTK_CHECK_VERSION(2, 8, 0)
- if (!gtk_check_version(2,8,0))
+ if ( gtk_check_version(2,8,0) == NULL )
+ {
+ // Make sure we can notify the app when mouse capture is lost
+ if ( m_wxwindow )
{
- // Make sure we can notify the app when mouse capture is lost
g_signal_connect (m_wxwindow, "grab_broken_event",
G_CALLBACK (gtk_window_grab_broken), this);
}
-#endif
- }
- if ( connect_widget != m_wxwindow )
- {
-#if GTK_CHECK_VERSION(2, 8, 0)
- if (!gtk_check_version(2,8,0))
+ if ( connect_widget != m_wxwindow )
{
- // Make sure we can notify app code when mouse capture is lost
g_signal_connect (connect_widget, "grab_broken_event",
G_CALLBACK (gtk_window_grab_broken), this);
}
-#endif
}
+#endif // GTK+ >= 2.8
-#ifdef GTK_IS_FILE_CHOOSER_BUTTON
- if (!gtk_check_version(2,6,0) && GTK_IS_FILE_CHOOSER_BUTTON(m_widget))
- {
- // If we connect to the "size_request" signal of a GtkFileChooserButton
- // then that control won't be sized properly when placed inside sizers
- // (this can be tested removing this elseif and running XRC or WIDGETS samples)
- // FIXME: what should be done here ?
- } else
-#endif
- if ( !IsTopLevel() ) // top level windows use their own callback
+ if ( GTKShouldConnectSizeRequest() )
{
// This is needed if we want to add our windows into native
// GTK controls, such as the toolbar. With this callback, the
gtk_widget_show( m_widget );
}
+gulong wxWindowGTK::GTKConnectWidget(const char *signal, void (*callback)())
+{
+ return g_signal_connect(m_widget, signal, callback, this);
+}
+
void wxWindowGTK::ConnectWidget( GtkWidget *widget )
{
g_signal_connect (widget, "key_press_event",
G_CALLBACK (gtk_window_button_release_callback), this);
g_signal_connect (widget, "motion_notify_event",
G_CALLBACK (gtk_window_motion_notify_callback), this);
+
g_signal_connect (widget, "scroll_event",
G_CALLBACK (window_scroll_event), this);
+ if (m_scrollBar[ScrollDir_Horz])
+ g_signal_connect (m_scrollBar[ScrollDir_Horz], "scroll_event",
+ G_CALLBACK (window_scroll_event_hscrollbar), this);
+ if (m_scrollBar[ScrollDir_Vert])
+ g_signal_connect (m_scrollBar[ScrollDir_Vert], "scroll_event",
+ G_CALLBACK (window_scroll_event), this);
+
g_signal_connect (widget, "popup_menu",
G_CALLBACK (wxgtk_window_popup_menu_callback), this);
g_signal_connect (widget, "enter_notify_event",
bool wxWindowGTK::Destroy()
{
- wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
-
m_hasVMT = false;
return wxWindowBase::Destroy();
void wxWindowGTK::DoMoveWindow(int x, int y, int width, int height)
{
gtk_widget_set_size_request(m_widget, width, height);
+
// inform the parent to perform the move
+ wxASSERT_MSG(m_parent && m_parent->m_wxwindow,
+ "the parent window has no client area?");
WX_PIZZA(m_parent->m_wxwindow)->move(m_widget, x, y);
}
int bottom_border = 0;
/* the default button has a border around it */
- if (GTK_WIDGET_CAN_DEFAULT(m_widget))
+ if (gtk_widget_get_can_default(m_widget))
{
GtkBorder *default_border = NULL;
gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
event.SetEventObject( this );
HandleWindowEvent( event );
}
+ } else
+ if (sizeFlags & wxSIZE_FORCE_EVENT)
+ {
+ wxSizeEvent event( wxSize(m_width,m_height), GetId() );
+ event.SetEventObject( this );
+ HandleWindowEvent( event );
}
}
-bool wxWindowGTK::GtkShowFromOnIdle()
+bool wxWindowGTK::GTKShowFromOnIdle()
{
- if (IsShown() && m_showOnIdle && !GTK_WIDGET_VISIBLE (m_widget))
+ if (IsShown() && m_showOnIdle && !gtk_widget_get_visible (m_widget))
{
GtkAllocation alloc;
alloc.x = m_x;
GTKHandleDeferredFocusOut();
// Check if we have to show window now
- if (GtkShowFromOnIdle()) return;
+ if (GTKShowFromOnIdle()) return;
if ( m_dirtyTabOrder )
{
RealizeTabOrder();
}
- // Update style if the window was not yet realized
- // and SetBackgroundStyle(wxBG_STYLE_CUSTOM) was called
+ // Update style if the window was not yet realized when
+ // SetBackgroundStyle() was called
if (m_needsStyleChange)
{
SetBackgroundStyle(GetBackgroundStyle());
m_needsStyleChange = false;
}
- wxCursor cursor = m_cursor;
- if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
- if (cursor.Ok())
- {
- /* I now set the cursor anew in every OnInternalIdle call
- as setting the cursor in a parent window also effects the
- windows above so that checking for the current cursor is
- not possible. */
-
- if (m_wxwindow && (m_wxwindow != m_widget))
- {
- GdkWindow *window = m_wxwindow->window;
- if (window)
- gdk_window_set_cursor( window, cursor.GetCursor() );
-
- if (!g_globalCursor.Ok())
- cursor = *wxSTANDARD_CURSOR;
-
- window = m_widget->window;
- if ((window) && !(GTK_WIDGET_NO_WINDOW(m_widget)))
- gdk_window_set_cursor( window, cursor.GetCursor() );
-
- }
- else if ( m_widget )
- {
- GdkWindow *window = m_widget->window;
- if ( window && !GTK_WIDGET_NO_WINDOW(m_widget) )
- gdk_window_set_cursor( window, cursor.GetCursor() );
- }
- }
-
- if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
+ wxWindowBase::OnInternalIdle();
}
void wxWindowGTK::DoGetSize( int *width, int *height ) const
int w = m_width;
int h = m_height;
- if (m_wxwindow)
+ if ( m_wxwindow )
{
// if window is scrollable, account for scrollbars
- for (int i = 0; i < 2 && m_scrollBar[i]; i++)
+ if ( GTK_IS_SCROLLED_WINDOW(m_widget) )
{
- GtkRequisition req;
- GtkAdjustment* adj = gtk_range_get_adjustment(m_scrollBar[i]);
- // if scrollbar enabled
- if (adj->upper > adj->page_size)
+ GtkPolicyType policy[ScrollDir_Max];
+ gtk_scrolled_window_get_policy(GTK_SCROLLED_WINDOW(m_widget),
+ &policy[ScrollDir_Horz],
+ &policy[ScrollDir_Vert]);
+
+ for ( int i = 0; i < ScrollDir_Max; i++ )
{
- gtk_widget_size_request(GTK_WIDGET(m_scrollBar[i]), &req);
+ // don't account for the scrollbars we don't have
+ GtkRange * const range = m_scrollBar[i];
+ if ( !range )
+ continue;
+
+ // nor for the ones we have but don't current show
+ switch ( policy[i] )
+ {
+ case GTK_POLICY_NEVER:
+ // never shown so doesn't take any place
+ continue;
+
+ case GTK_POLICY_ALWAYS:
+ // no checks necessary
+ break;
+
+ case GTK_POLICY_AUTOMATIC:
+ // may be shown or not, check
+ GtkAdjustment *adj = gtk_range_get_adjustment(range);
+ if (gtk_adjustment_get_upper(adj) <= gtk_adjustment_get_page_size(adj))
+ continue;
+ }
+
+ GtkScrolledWindowClass *scroll_class =
+ GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT_GET_CLASS(m_widget) );
+
+ GtkRequisition req;
+ gtk_widget_size_request(GTK_WIDGET(range), &req);
if (i == ScrollDir_Horz)
- h -= req.height;
+ h -= req.height + scroll_class->scrollbar_spacing;
else
- w -= req.width;
+ w -= req.width + scroll_class->scrollbar_spacing;
}
}
- int border_x, border_y;
- WX_PIZZA(m_wxwindow)->get_border_widths(border_x, border_y);
- w -= 2 * border_x;
- h -= 2 * border_y;
+ const wxSize sizeBorders = DoGetBorderSize();
+ w -= sizeBorders.x;
+ h -= sizeBorders.y;
if (w < 0)
w = 0;
if (height) *height = h;
}
+wxSize wxWindowGTK::DoGetBorderSize() const
+{
+ if ( !m_wxwindow )
+ return wxWindowBase::DoGetBorderSize();
+
+ int x, y;
+ WX_PIZZA(m_wxwindow)->get_border_widths(x, y);
+
+ return 2*wxSize(x, y);
+}
+
void wxWindowGTK::DoGetPosition( int *x, int *y ) const
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
if (m_x == -1 && m_y == -1)
{
- GdkWindow *source = (GdkWindow *) NULL;
+ GdkWindow *source = NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = gtk_widget_get_window(m_wxwindow);
else
- source = m_widget->window;
+ source = gtk_widget_get_window(m_widget);
if (source)
{
if (m_parent)
m_parent->ScreenToClient(&org_x, &org_y);
- wx_const_cast(wxWindowGTK*, this)->m_x = org_x;
- wx_const_cast(wxWindowGTK*, this)->m_y = org_y;
+ const_cast<wxWindowGTK*>(this)->m_x = org_x;
+ const_cast<wxWindowGTK*>(this)->m_y = org_y;
}
}
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (!m_widget->window) return;
+ if (gtk_widget_get_window(m_widget) == NULL) return;
- GdkWindow *source = (GdkWindow *) NULL;
+ GdkWindow *source = NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = gtk_widget_get_window(m_wxwindow);
else
- source = m_widget->window;
+ source = gtk_widget_get_window(m_widget);
int org_x = 0;
int org_y = 0;
if (!m_wxwindow)
{
- if (GTK_WIDGET_NO_WINDOW (m_widget))
+ if (!gtk_widget_get_has_window(m_widget))
{
- org_x += m_widget->allocation.x;
- org_y += m_widget->allocation.y;
+ GtkAllocation a;
+ gtk_widget_get_allocation(m_widget, &a);
+ org_x += a.x;
+ org_y += a.y;
}
}
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (!m_widget->window) return;
+ if (!gtk_widget_get_realized(m_widget)) return;
- GdkWindow *source = (GdkWindow *) NULL;
+ GdkWindow *source = NULL;
if (m_wxwindow)
- source = m_wxwindow->window;
+ source = gtk_widget_get_window(m_wxwindow);
else
- source = m_widget->window;
+ source = gtk_widget_get_window(m_widget);
int org_x = 0;
int org_y = 0;
if (!m_wxwindow)
{
- if (GTK_WIDGET_NO_WINDOW (m_widget))
+ if (!gtk_widget_get_has_window(m_widget))
{
- org_x += m_widget->allocation.x;
- org_y += m_widget->allocation.y;
+ GtkAllocation a;
+ gtk_widget_get_allocation(m_widget, &a);
+ org_x += a.x;
+ org_y += a.y;
}
}
bool wxWindowGTK::Show( bool show )
{
- wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
-
- if (!wxWindowBase::Show(show))
+ if ( !wxWindowBase::Show(show) )
{
// nothing to do
return false;
}
- if (show && m_showOnIdle)
+ // notice that we may call Hide() before the window is created and this is
+ // actually useful to create it hidden initially -- but we can't call
+ // Show() before it is created
+ if ( !m_widget )
{
- // deferred
+ wxASSERT_MSG( !show, "can't show invalid window" );
+ return true;
}
- else
+
+ if ( show )
{
- if (show)
- gtk_widget_show(m_widget);
- else
- gtk_widget_hide(m_widget);
- wxShowEvent eventShow(GetId(), show);
- eventShow.SetEventObject(this);
- HandleWindowEvent(eventShow);
+ if ( m_showOnIdle )
+ {
+ // defer until later
+ return true;
+ }
+
+ gtk_widget_show(m_widget);
+ }
+ else // hide
+ {
+ gtk_widget_hide(m_widget);
}
+ wxShowEvent eventShow(GetId(), show);
+ eventShow.SetEventObject(this);
+ HandleWindowEvent(eventShow);
+
return true;
}
wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") );
wxFont font = GetFont();
- wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );
+ wxCHECK_MSG( font.IsOk(), 12, wxT("invalid font") );
PangoContext* context = gtk_widget_get_pango_context(m_widget);
wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") );
wxFont font = GetFont();
- wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );
+ wxCHECK_MSG( font.IsOk(), 8, wxT("invalid font") );
PangoContext* context = gtk_widget_get_pango_context(m_widget);
return (int) PANGO_PIXELS(rect.width);
}
-void wxWindowGTK::GetTextExtent( const wxString& string,
- int *x,
- int *y,
- int *descent,
- int *externalLeading,
- const wxFont *theFont ) const
+void wxWindowGTK::DoGetTextExtent( const wxString& string,
+ int *x,
+ int *y,
+ int *descent,
+ int *externalLeading,
+ const wxFont *theFont ) const
{
wxFont fontToUse = theFont ? *theFont : GetFont();
- wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
+ wxCHECK_RET( fontToUse.IsOk(), wxT("invalid font") );
if (string.empty())
{
g_object_unref (layout);
}
+void wxWindowGTK::GTKDisableFocusOutEvent()
+{
+ g_signal_handlers_block_by_func( m_focusWidget,
+ (gpointer) gtk_window_focus_out_callback, this);
+}
+
+void wxWindowGTK::GTKEnableFocusOutEvent()
+{
+ g_signal_handlers_unblock_by_func( m_focusWidget,
+ (gpointer) gtk_window_focus_out_callback, this);
+}
bool wxWindowGTK::GTKHandleFocusIn()
{
// Notify the parent keeping track of focus for the kbd navigation
// purposes that we got it.
- wxChildFocusEvent eventChildFocus(this);
+ wxChildFocusEvent eventChildFocus(static_cast<wxWindow*>(this));
GTKProcessEvent(eventChildFocus);
wxFocusEvent eventFocus(wxEVT_SET_FOCUS, GetId());
// within its toplevel", i.e. returns true for one widget per TLW, not
// globally) returns true immediately after grabbing focus,
// GTK_WIDGET_HAS_FOCUS (which returns true only for the one widget that
- // has focus at the moment) takes affect only after the window is shown
+ // has focus at the moment) takes effect only after the window is shown
// (if it was hidden at the moment of the call) or at the next event loop
// iteration.
//
GtkWidget *widget = m_wxwindow ? m_wxwindow : m_focusWidget;
if ( GTK_IS_CONTAINER(widget) &&
- !GTK_WIDGET_CAN_FOCUS(widget) )
+ !gtk_widget_get_can_focus(widget) )
{
wxLogTrace(TRACE_FOCUS,
- _T("Setting focus to a child of %s(%p, %s)"),
+ wxT("Setting focus to a child of %s(%p, %s)"),
GetClassInfo()->GetClassName(), this, GetLabel().c_str());
gtk_widget_child_focus(widget, GTK_DIR_TAB_FORWARD);
}
else
{
wxLogTrace(TRACE_FOCUS,
- _T("Setting focus to %s(%p, %s)"),
+ wxT("Setting focus to %s(%p, %s)"),
GetClassInfo()->GetClassName(), this, GetLabel().c_str());
gtk_widget_grab_focus(widget);
}
void wxWindowGTK::SetCanFocus(bool canFocus)
{
- if ( canFocus )
- GTK_WIDGET_SET_FLAGS(m_widget, GTK_CAN_FOCUS);
- else
- GTK_WIDGET_UNSET_FLAGS(m_widget, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus(m_widget, canFocus);
if ( m_wxwindow && (m_widget != m_wxwindow) )
{
- if ( canFocus )
- GTK_WIDGET_SET_FLAGS(m_wxwindow, GTK_CAN_FOCUS);
- else
- GTK_WIDGET_UNSET_FLAGS(m_wxwindow, GTK_CAN_FOCUS);
+ gtk_widget_set_can_focus(m_wxwindow, canFocus);
}
}
{
wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
- wxWindowGTK *oldParent = m_parent,
- *newParent = (wxWindowGTK *)newParentBase;
+ wxWindowGTK * const newParent = (wxWindowGTK *)newParentBase;
wxASSERT( GTK_IS_WIDGET(m_widget) );
wxASSERT( GTK_IS_WIDGET(m_widget) );
- /* prevent GTK from deleting the widget arbitrarily */
- gtk_widget_ref( m_widget );
-
- if (oldParent)
- {
- gtk_container_remove( GTK_CONTAINER(m_widget->parent), m_widget );
- }
+ // Notice that old m_parent pointer might be non-NULL here but the widget
+ // still not have any parent at GTK level if it's a notebook page that had
+ // been removed from the notebook so test this at GTK level and not wx one.
+ if ( GtkWidget *parentGTK = gtk_widget_get_parent(m_widget) )
+ gtk_container_remove(GTK_CONTAINER(parentGTK), m_widget);
wxASSERT( GTK_IS_WIDGET(m_widget) );
if (newParent)
{
- if (GTK_WIDGET_VISIBLE (newParent->m_widget))
+ if (gtk_widget_get_visible (newParent->m_widget))
{
m_showOnIdle = true;
gtk_widget_hide( m_widget );
}
-
/* insert GTK representation */
- (*(newParent->m_insertCallback))(newParent, this);
+ newParent->AddChildGTK(this);
}
- /* reverse: prevent GTK from deleting the widget arbitrarily */
- gtk_widget_unref( m_widget );
-
SetLayoutDirection(wxLayout_Default);
return true;
AddChild( child );
/* insert GTK representation */
- (*m_insertCallback)(this, child);
+ AddChildGTK(child);
}
void wxWindowGTK::AddChild(wxWindowBase *child)
/* static */
void wxWindowGTK::GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir)
{
- wxASSERT_MSG( dir != wxLayout_Default, _T("invalid layout direction") );
+ wxASSERT_MSG( dir != wxLayout_Default, wxT("invalid layout direction") );
gtk_widget_set_direction(widget,
dir == wxLayout_RightToLeft ? GTK_TEXT_DIR_RTL
{
if ( flags & wxNavigationKeyEvent::WinChange )
{
- wxFAIL_MSG( _T("not implemented") );
+ wxFAIL_MSG( wxT("not implemented") );
return false;
}
else // navigate inside the container
{
wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
- wxCHECK_MSG( parent, false, _T("every window must have a TLW parent") );
+ wxCHECK_MSG( parent, false, wxT("every window must have a TLW parent") );
GtkDirectionType dir;
dir = flags & wxNavigationKeyEvent::IsForward ? GTK_DIR_TAB_FORWARD
{
wxWindowGTK *win = *i;
+ bool focusableFromKeyboard = win->AcceptsFocusFromKeyboard();
+
if ( mnemonicWindow )
{
- if ( win->AcceptsFocusFromKeyboard() )
+ if ( focusableFromKeyboard )
{
// wxComboBox et al. needs to focus on on a different
// widget than m_widget, so if the main widget isn't
// focusable try the connect widget
GtkWidget* w = win->m_widget;
- if ( !GTK_WIDGET_CAN_FOCUS(w) )
+ if ( !gtk_widget_get_can_focus(w) )
{
w = win->GetConnectWidget();
- if ( !GTK_WIDGET_CAN_FOCUS(w) )
+ if ( !gtk_widget_get_can_focus(w) )
w = NULL;
}
mnemonicWindow = win;
}
- chain = g_list_prepend(chain, win->m_widget);
+ if ( focusableFromKeyboard )
+ chain = g_list_prepend(chain, win->m_widget);
}
chain = g_list_reverse(chain);
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (m_wxwindow && m_wxwindow->window)
+ if (m_wxwindow && gtk_widget_get_window(m_wxwindow))
{
- gdk_window_raise( m_wxwindow->window );
+ gdk_window_raise(gtk_widget_get_window(m_wxwindow));
}
- else if (m_widget->window)
+ else if (gtk_widget_get_window(m_widget))
{
- gdk_window_raise( m_widget->window );
+ gdk_window_raise(gtk_widget_get_window(m_widget));
}
}
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (m_wxwindow && m_wxwindow->window)
+ if (m_wxwindow && gtk_widget_get_window(m_wxwindow))
{
- gdk_window_lower( m_wxwindow->window );
+ gdk_window_lower(gtk_widget_get_window(m_wxwindow));
}
- else if (m_widget->window)
+ else if (gtk_widget_get_window(m_widget))
{
- gdk_window_lower( m_widget->window );
+ gdk_window_lower(gtk_widget_get_window(m_widget));
}
}
bool wxWindowGTK::SetCursor( const wxCursor &cursor )
{
- if ( !wxWindowBase::SetCursor(cursor.Ok() ? cursor : *wxSTANDARD_CURSOR) )
+ if ( !wxWindowBase::SetCursor(cursor.IsOk() ? cursor : *wxSTANDARD_CURSOR) )
return false;
GTKUpdateCursor();
return true;
}
-void wxWindowGTK::GTKUpdateCursor()
+void wxWindowGTK::GTKUpdateCursor(bool update_self /*=true*/, bool recurse /*=true*/)
{
- wxCursor cursor(g_globalCursor.Ok() ? g_globalCursor : GetCursor());
- if ( cursor.Ok() )
+ if (update_self)
{
- wxArrayGdkWindows windowsThis;
- GdkWindow * const winThis = GTKGetWindow(windowsThis);
- if ( winThis )
+ wxCursor cursor(g_globalCursor.IsOk() ? g_globalCursor : GetCursor());
+ if ( cursor.IsOk() )
{
- gdk_window_set_cursor(winThis, cursor.GetCursor());
- }
- else
- {
- const size_t count = windowsThis.size();
- for ( size_t n = 0; n < count; n++ )
+ wxArrayGdkWindows windowsThis;
+ GdkWindow* window = GTKGetWindow(windowsThis);
+ if (window)
+ gdk_window_set_cursor( window, cursor.GetCursor() );
+ else
{
- GdkWindow *win = windowsThis[n];
- if ( !win )
+ const size_t count = windowsThis.size();
+ for ( size_t n = 0; n < count; n++ )
{
- wxFAIL_MSG(_T("NULL window returned by GTKGetWindow()?"));
- continue;
+ GdkWindow *win = windowsThis[n];
+ // It can be zero if the window has not been realized yet.
+ if ( win )
+ {
+ gdk_window_set_cursor(win, cursor.GetCursor());
+ }
}
-
- gdk_window_set_cursor(win, cursor.GetCursor());
}
}
}
+
+ if (recurse)
+ {
+ for (wxWindowList::iterator it = GetChildren().begin(); it != GetChildren().end(); ++it)
+ {
+ (*it)->GTKUpdateCursor( true );
+ }
+ }
}
void wxWindowGTK::WarpPointer( int x, int y )
// We provide this function ourselves as it is
// missing in GDK (top of this file).
- GdkWindow *window = (GdkWindow*) NULL;
+ GdkWindow *window = NULL;
if (m_wxwindow)
- window = m_wxwindow->window;
+ window = gtk_widget_get_window(m_wxwindow);
else
- window = GetConnectWidget()->window;
+ window = gtk_widget_get_window(GetConnectWidget());
if (window)
gdk_window_warp_pointer( window, x, y );
return (ScrollDir)dir;
}
- wxFAIL_MSG( _T("event from unknown scrollbar received") );
+ wxFAIL_MSG( wxT("event from unknown scrollbar received") );
return ScrollDir_Max;
}
GtkRange* range = m_scrollBar[dir];
if ( range && units )
{
- GtkAdjustment* adj = range->adjustment;
- gdouble inc = unit == ScrollUnit_Line ? adj->step_increment
- : adj->page_increment;
+ GtkAdjustment* adj = gtk_range_get_adjustment(range);
+ double inc = unit == ScrollUnit_Line ? gtk_adjustment_get_step_increment(adj)
+ : gtk_adjustment_get_page_increment(adj);
- const int posOld = int(adj->value + 0.5);
+ const int posOld = wxRound(gtk_adjustment_get_value(adj));
gtk_range_set_value(range, posOld + units*inc);
- changed = int(adj->value + 0.5) != posOld;
+ changed = wxRound(gtk_adjustment_get_value(adj)) != posOld;
}
return changed;
void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect)
{
- if (!m_widget)
- return;
- if (!m_widget->window)
+ if ( !m_widget )
+ {
+ // it is valid to call Refresh() for a window which hasn't been created
+ // yet, it simply doesn't do anything in this case
return;
+ }
- if (m_wxwindow)
+ if (!m_wxwindow)
+ {
+ if (rect)
+ gtk_widget_queue_draw_area( m_widget, rect->x, rect->y, rect->width, rect->height );
+ else
+ gtk_widget_queue_draw( m_widget );
+ }
+ else
{
- if (m_wxwindow->window == NULL) return;
+ // Just return if the widget or one of its ancestors isn't mapped
+ GtkWidget *w;
+ for (w = m_wxwindow; w != NULL; w = gtk_widget_get_parent(w))
+ if (!gtk_widget_get_mapped (w))
+ return;
- GdkRectangle gdk_rect,
- *p;
+ GdkWindow* window = GTKGetDrawingWindow();
if (rect)
{
- gdk_rect.x = rect->x;
- gdk_rect.y = rect->y;
- gdk_rect.width = rect->width;
- gdk_rect.height = rect->height;
+ int x = rect->x;
if (GetLayoutDirection() == wxLayout_RightToLeft)
- gdk_rect.x = GetClientSize().x - gdk_rect.x - gdk_rect.width;
-
- p = &gdk_rect;
+ x = GetClientSize().x - x - rect->width;
+ GdkRectangle r;
+ r.x = rect->x;
+ r.y = rect->y;
+ r.width = rect->width;
+ r.height = rect->height;
+ gdk_window_invalidate_rect(window, &r, true);
}
- else // invalidate everything
- {
- p = NULL;
- }
-
- gdk_window_invalidate_rect(m_wxwindow->window, p, true);
+ else
+ gdk_window_invalidate_rect(window, NULL, true);
}
}
void wxWindowGTK::Update()
{
- GtkUpdate();
-
- // when we call Update() we really want to update the window immediately on
- // screen, even if it means flushing the entire queue and hence slowing down
- // everything -- but it should still be done, it's just that Update() should
- // be called very rarely
- gdk_flush();
-}
+ if (m_widget && gtk_widget_get_mapped(m_widget))
+ {
+ GdkDisplay* display = gtk_widget_get_display(m_widget);
+ // Flush everything out to the server, and wait for it to finish.
+ // This ensures nothing will overwrite the drawing we are about to do.
+ gdk_display_sync(display);
-void wxWindowGTK::GtkUpdate()
-{
- if (m_wxwindow && m_wxwindow->window)
- gdk_window_process_updates(m_wxwindow->window, false);
- if (m_widget && m_widget->window && (m_wxwindow != m_widget))
- gdk_window_process_updates( m_widget->window, FALSE );
+ GdkWindow* window = GTKGetDrawingWindow();
+ if (window == NULL)
+ window = gtk_widget_get_window(m_widget);
+ gdk_window_process_updates(window, true);
- // for consistency with other platforms (and also because it's convenient
- // to be able to update an entire TLW by calling Update() only once), we
- // should also update all our children here
- for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
- node;
- node = node->GetNext() )
- {
- node->GetData()->GtkUpdate();
+ // Flush again, but no need to wait for it to finish
+ gdk_display_flush(display);
}
}
return m_updateRegion.Contains(x, y) != wxOutRegion;
}
-
bool wxWindowGTK::DoIsExposed( int x, int y, int w, int h ) const
{
if (GetLayoutDirection() == wxLayout_RightToLeft)
m_updateRegion.Clear();
gint width;
- gdk_drawable_get_size(m_wxwindow->window, &width, NULL);
+ gdk_drawable_get_size(gtk_widget_get_window(m_wxwindow), &width, NULL);
wxRegionIterator upd( m_nativeUpdateRegion );
while (upd)
}
}
- if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM))
+ switch ( GetBackgroundStyle() )
{
- // find ancestor from which to steal background
- wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
- if (!parent)
- parent = (wxWindow*)this;
-
- if (GTK_WIDGET_MAPPED(parent->m_widget))
- {
- wxRegionIterator upd( m_nativeUpdateRegion );
- while (upd)
+ case wxBG_STYLE_ERASE:
{
- GdkRectangle rect;
- rect.x = upd.GetX();
- rect.y = upd.GetY();
- rect.width = upd.GetWidth();
- rect.height = upd.GetHeight();
-
- gtk_paint_flat_box( parent->m_widget->style,
- m_wxwindow->window,
- (GtkStateType)GTK_WIDGET_STATE(m_wxwindow),
- GTK_SHADOW_NONE,
- &rect,
- parent->m_widget,
- (char *)"base",
- 0, 0, -1, -1 );
-
- ++upd;
+ wxWindowDC dc( (wxWindow*)this );
+ dc.SetDeviceClippingRegion( m_updateRegion );
+
+ // Work around gtk-qt <= 0.60 bug whereby the window colour
+ // remains grey
+ if ( UseBgCol() &&
+ wxSystemOptions::
+ GetOptionInt("gtk.window.force-background-colour") )
+ {
+ dc.SetBackground(GetBackgroundColour());
+ dc.Clear();
+ }
+
+ wxEraseEvent erase_event( GetId(), &dc );
+ erase_event.SetEventObject( this );
+
+ if ( HandleWindowEvent(erase_event) )
+ {
+ // background erased, don't do it again
+ break;
+ }
}
- }
- }
- else
- {
- wxWindowDC dc( (wxWindow*)this );
- dc.SetDeviceClippingRegion( m_updateRegion );
+ // fall through
- // Work around gtk-qt <= 0.60 bug whereby the window colour
- // remains grey
- if (GetBackgroundStyle() == wxBG_STYLE_COLOUR && GetBackgroundColour().Ok() && wxSystemOptions::GetOptionInt(wxT("gtk.window.force-background-colour")) == 1)
- {
- dc.SetBackground(wxBrush(GetBackgroundColour()));
- dc.Clear();
- }
+ case wxBG_STYLE_SYSTEM:
+ if ( GetThemeEnabled() )
+ {
+ // find ancestor from which to steal background
+ wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
+ if (!parent)
+ parent = (wxWindow*)this;
- wxEraseEvent erase_event( GetId(), &dc );
- erase_event.SetEventObject( this );
+ if (gtk_widget_get_mapped(parent->m_widget))
+ {
+ wxRegionIterator upd( m_nativeUpdateRegion );
+ while (upd)
+ {
+ GdkRectangle rect;
+ rect.x = upd.GetX();
+ rect.y = upd.GetY();
+ rect.width = upd.GetWidth();
+ rect.height = upd.GetHeight();
+
+ gtk_paint_flat_box(gtk_widget_get_style(parent->m_widget),
+ GTKGetDrawingWindow(),
+ gtk_widget_get_state(m_wxwindow),
+ GTK_SHADOW_NONE,
+ &rect,
+ parent->m_widget,
+ (char *)"base",
+ 0, 0, -1, -1 );
+
+ ++upd;
+ }
+ }
+ }
+ break;
- HandleWindowEvent(erase_event);
+ case wxBG_STYLE_PAINT:
+ // nothing to do: window will be painted over in EVT_PAINT
+ break;
+
+ default:
+ wxFAIL_MSG( "unsupported background style" );
}
wxNcPaintEvent nc_paint_event( GetId() );
bool wxWindowGTK::IsDoubleBuffered() const
{
- return GTK_WIDGET_DOUBLE_BUFFERED( m_wxwindow );
+ return gtk_widget_get_double_buffered( m_wxwindow );
}
void wxWindowGTK::ClearBackground()
#if wxUSE_TOOLTIPS
void wxWindowGTK::DoSetToolTip( wxToolTip *tip )
{
- wxWindowBase::DoSetToolTip(tip);
+ if (m_tooltip != tip)
+ {
+ wxWindowBase::DoSetToolTip(tip);
- if (m_tooltip)
- m_tooltip->Apply( (wxWindow *)this );
+ if (m_tooltip)
+ m_tooltip->GTKSetWindow(static_cast<wxWindow*>(this));
+ else
+ GTKApplyToolTip(NULL);
+ }
}
-void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
+void wxWindowGTK::GTKApplyToolTip(const char* tip)
{
- gtk_tooltips_set_tip(tips, GetConnectWidget(), tip, NULL);
+ wxToolTip::GTKApply(GetConnectWidget(), tip);
}
#endif // wxUSE_TOOLTIPS
if (!wxWindowBase::SetBackgroundColour(colour))
return false;
- if (colour.Ok())
+ if (colour.IsOk())
{
// We need the pixel value e.g. for background clearing.
m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
// apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour)
- if (GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
- ApplyWidgetStyle(true);
+ GTKApplyWidgetStyle(true);
return true;
}
return false;
}
- if (colour.Ok())
+ if (colour.IsOk())
{
// We need the pixel value e.g. for background clearing.
m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget));
// apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour):
- ApplyWidgetStyle(true);
+ GTKApplyWidgetStyle(true);
return true;
}
-PangoContext *wxWindowGTK::GtkGetPangoDefaultContext()
+PangoContext *wxWindowGTK::GTKGetPangoDefaultContext()
{
return gtk_widget_get_pango_context( m_widget );
}
-GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
+GtkRcStyle *wxWindowGTK::GTKCreateWidgetStyle(bool forceStyle)
{
// do we need to apply any changes at all?
if ( !forceStyle &&
- !m_font.Ok() &&
- !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
+ !m_font.IsOk() &&
+ !m_foregroundColour.IsOk() && !m_backgroundColour.IsOk() )
{
return NULL;
}
GtkRcStyle *style = gtk_rc_style_new();
- if ( m_font.Ok() )
+ if ( m_font.IsOk() )
{
style->font_desc =
pango_font_description_copy( m_font.GetNativeFontInfo()->description );
flagsActive = 0,
flagsInsensitive = 0;
- if ( m_foregroundColour.Ok() )
+ if ( m_foregroundColour.IsOk() )
{
const GdkColor *fg = m_foregroundColour.GetColor();
flagsActive |= GTK_RC_FG | GTK_RC_TEXT;
}
- if ( m_backgroundColour.Ok() )
+ if ( m_backgroundColour.IsOk() )
{
const GdkColor *bg = m_backgroundColour.GetColor();
return style;
}
-void wxWindowGTK::ApplyWidgetStyle(bool forceStyle)
+void wxWindowGTK::GTKApplyWidgetStyle(bool forceStyle)
{
- GtkRcStyle *style = CreateWidgetStyle(forceStyle);
+ GtkRcStyle *style = GTKCreateWidgetStyle(forceStyle);
if ( style )
{
DoApplyWidgetStyle(style);
- gtk_rc_style_unref(style);
+ g_object_unref(style);
}
// Style change may affect GTK+'s size calculation:
void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
{
- wxSuspendStyleEvents s(static_cast<wxWindow*>(this));
+ if ( m_wxwindow )
+ {
+ // block the signal temporarily to avoid sending
+ // wxSysColourChangedEvents when we change the colours ourselves
+ bool unblock = false;
+ if ( IsTopLevel() )
+ {
+ unblock = true;
+ g_signal_handlers_block_by_func(
+ m_wxwindow, (void *)gtk_window_style_set_callback, this);
+ }
- if (m_wxwindow)
gtk_widget_modify_style(m_wxwindow, style);
+
+ if ( unblock )
+ {
+ g_signal_handlers_unblock_by_func(
+ m_wxwindow, (void *)gtk_window_style_set_callback, this);
+ }
+ }
else
+ {
gtk_widget_modify_style(m_widget, style);
+ }
}
bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
{
wxWindowBase::SetBackgroundStyle(style);
- if (style == wxBG_STYLE_CUSTOM)
+ if ( style == wxBG_STYLE_PAINT )
{
GdkWindow *window;
if ( m_wxwindow )
{
- window = m_wxwindow->window;
+ window = GTKGetDrawingWindow();
}
else
{
GtkWidget * const w = GetConnectWidget();
- window = w ? w->window : NULL;
+ window = w ? gtk_widget_get_window(w) : NULL;
}
if (window)
{
// apply style change (forceStyle=true so that new style is applied
// even if the bg colour changed from valid to wxNullColour):
- ApplyWidgetStyle(true);
+ GTKApplyWidgetStyle(true);
}
+
return true;
}
#if wxUSE_MENUS_NATIVE
-static void SetInvokingWindow( wxMenu *menu, wxWindow* win )
-{
- menu->SetInvokingWindow( win );
-
- wxMenuItemList::compatibility_iterator node = menu->GetMenuItems().GetFirst();
- while (node)
- {
- wxMenuItem *menuitem = node->GetData();
- if (menuitem->IsSubMenu())
- {
- SetInvokingWindow( menuitem->GetSubMenu(), win );
- }
-
- node = node->GetNext();
- }
-}
-
extern "C" {
static
void wxPopupMenuPositionCallback( GtkMenu *menu,
}
}
-void wxWindowGTK::DoPopupMenuUpdateUI(wxMenu* menu)
-{
- menu->UpdateUI();
-}
-
bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
{
wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
- wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
-
- SetInvokingWindow( menu, this );
-
- DoPopupMenuUpdateUI(menu);
+ menu->UpdateUI();
wxPoint pos;
gpointer userdata;
menu->m_popupShown = true;
gtk_menu_popup(
GTK_MENU(menu->m_menu),
- (GtkWidget *) NULL, // parent menu shell
- (GtkWidget *) NULL, // parent menu item
+ NULL, // parent menu shell
+ NULL, // parent menu item
posfunc, // function to position it
userdata, // client data
0, // button used to activate it
GtkWidget *dnd_widget = GetConnectWidget();
- if (m_dropTarget) m_dropTarget->UnregisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->GtkUnregisterWidget( dnd_widget );
if (m_dropTarget) delete m_dropTarget;
m_dropTarget = dropTarget;
- if (m_dropTarget) m_dropTarget->RegisterWidget( dnd_widget );
+ if (m_dropTarget) m_dropTarget->GtkRegisterWidget( dnd_widget );
}
#endif // wxUSE_DRAG_AND_DROP
GdkWindow *wxWindowGTK::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{
- return m_wxwindow ? m_wxwindow->window : m_widget->window;
+ return m_wxwindow ? GTKGetDrawingWindow() : gtk_widget_get_window(m_widget);
}
bool wxWindowGTK::SetFont( const wxFont &font )
// apply style change (forceStyle=true so that new style is applied
// even if the font changed from valid to wxNullFont):
- ApplyWidgetStyle(true);
+ GTKApplyWidgetStyle(true);
return true;
}
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
- GdkWindow *window = (GdkWindow*) NULL;
+ GdkWindow *window = NULL;
if (m_wxwindow)
- window = m_wxwindow->window;
+ window = GTKGetDrawingWindow();
else
- window = GetConnectWidget()->window;
+ window = gtk_widget_get_window(GetConnectWidget());
- wxCHECK_RET( window, _T("CaptureMouse() failed") );
+ wxCHECK_RET( window, wxT("CaptureMouse() failed") );
const wxCursor* cursor = &m_cursor;
- if (!cursor->Ok())
+ if (!cursor->IsOk())
cursor = wxSTANDARD_CURSOR;
gdk_pointer_grab( window, FALSE,
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_POINTER_MOTION_MASK),
- (GdkWindow *) NULL,
+ NULL,
cursor->GetCursor(),
(guint32)GDK_CURRENT_TIME );
g_captureWindow = this;
wxCHECK_RET( g_captureWindow, wxT("can't release mouse - not captured") );
- g_captureWindow = (wxWindowGTK*) NULL;
+ g_captureWindow = NULL;
- GdkWindow *window = (GdkWindow*) NULL;
+ GdkWindow *window = NULL;
if (m_wxwindow)
- window = m_wxwindow->window;
+ window = GTKGetDrawingWindow();
else
- window = GetConnectWidget()->window;
+ window = gtk_widget_get_window(GetConnectWidget());
if (!window)
return;
{
const int dir = ScrollDirFromOrient(orient);
GtkRange* const sb = m_scrollBar[dir];
- wxCHECK_RET( sb, _T("this window is not scrollable") );
+ wxCHECK_RET( sb, wxT("this window is not scrollable") );
if (range <= 0)
{
thumbVisible = 1;
}
- GtkAdjustment * const adj = sb->adjustment;
- adj->step_increment = 1;
- adj->page_increment =
- adj->page_size = thumbVisible;
- adj->value = pos;
-
g_signal_handlers_block_by_func(
sb, (void*)gtk_scrollbar_value_changed, this);
+ gtk_range_set_increments(sb, 1, thumbVisible);
+ gtk_adjustment_set_page_size(gtk_range_get_adjustment(sb), thumbVisible);
gtk_range_set_range(sb, 0, range);
- m_scrollPos[dir] = sb->adjustment->value;
+ gtk_range_set_value(sb, pos);
+ m_scrollPos[dir] = gtk_range_get_value(sb);
g_signal_handlers_unblock_by_func(
sb, (void*)gtk_scrollbar_value_changed, this);
{
const int dir = ScrollDirFromOrient(orient);
GtkRange * const sb = m_scrollBar[dir];
- wxCHECK_RET( sb, _T("this window is not scrollable") );
+ wxCHECK_RET( sb, wxT("this window is not scrollable") );
// This check is more than an optimization. Without it, the slider
// will not move smoothly while tracking when using wxScrollHelper.
sb, (void*)gtk_scrollbar_value_changed, this);
gtk_range_set_value(sb, pos);
- m_scrollPos[dir] = sb->adjustment->value;
+ m_scrollPos[dir] = gtk_range_get_value(sb);
g_signal_handlers_unblock_by_func(
sb, (void*)gtk_scrollbar_value_changed, this);
int wxWindowGTK::GetScrollThumb(int orient) const
{
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
- wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
+ wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") );
- return int(sb->adjustment->page_size);
+ return wxRound(gtk_adjustment_get_page_size(gtk_range_get_adjustment(sb)));
}
int wxWindowGTK::GetScrollPos( int orient ) const
{
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
- wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
+ wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") );
- return int(sb->adjustment->value + 0.5);
+ return wxRound(gtk_range_get_value(sb));
}
int wxWindowGTK::GetScrollRange( int orient ) const
{
GtkRange * const sb = m_scrollBar[ScrollDirFromOrient(orient)];
- wxCHECK_MSG( sb, 0, _T("this window is not scrollable") );
+ wxCHECK_MSG( sb, 0, wxT("this window is not scrollable") );
- return int(sb->adjustment->upper);
+ return wxRound(gtk_adjustment_get_upper(gtk_range_get_adjustment(sb)));
}
// Determine if increment is the same as +/-x, allowing for some small
return fabs(increment - fabs(x)) < tolerance;
}
-wxEventType wxWindowGTK::GetScrollEventType(GtkRange* range)
+wxEventType wxWindowGTK::GTKGetScrollEventType(GtkRange* range)
{
wxASSERT(range == m_scrollBar[0] || range == m_scrollBar[1]);
const int barIndex = range == m_scrollBar[1];
- GtkAdjustment* adj = range->adjustment;
- const int value = int(adj->value + 0.5);
+ const double value = gtk_range_get_value(range);
// save previous position
const double oldPos = m_scrollPos[barIndex];
// update current position
- m_scrollPos[barIndex] = adj->value;
+ m_scrollPos[barIndex] = value;
// If event should be ignored, or integral position has not changed
- if (!m_hasVMT || g_blockEventsOnDrag || value == int(oldPos + 0.5))
+ if (!m_hasVMT || g_blockEventsOnDrag || wxRound(value) == wxRound(oldPos))
{
return wxEVT_NULL;
}
if (!m_isScrolling)
{
// Difference from last change event
- const double diff = adj->value - oldPos;
+ const double diff = value - oldPos;
const bool isDown = diff > 0;
- if (IsScrollIncrement(adj->step_increment, diff))
+ GtkAdjustment* adj = gtk_range_get_adjustment(range);
+ if (IsScrollIncrement(gtk_adjustment_get_step_increment(adj), diff))
{
eventType = isDown ? wxEVT_SCROLL_LINEDOWN : wxEVT_SCROLL_LINEUP;
}
- else if (IsScrollIncrement(adj->page_increment, diff))
+ else if (IsScrollIncrement(gtk_adjustment_get_page_increment(adj), diff))
{
eventType = isDown ? wxEVT_SCROLL_PAGEDOWN : wxEVT_SCROLL_PAGEUP;
}
#endif // wxUSE_CARET
}
-void wxWindowGTK::GtkScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
+void wxWindowGTK::GTKScrolledWindowSetBorder(GtkWidget* w, int wxstyle)
{
//RN: Note that static controls usually have no border on gtk, so maybe
//it makes sense to treat that as simply no border at the wx level
if(wxstyle & wxBORDER_RAISED)
gtkstyle = GTK_SHADOW_OUT;
- else if (wxstyle & wxBORDER_SUNKEN)
+ else if ((wxstyle & wxBORDER_SUNKEN) || (wxstyle & wxBORDER_THEME))
gtkstyle = GTK_SHADOW_IN;
#if 0
// Now obsolete
{
GdkWindow* window = NULL;
if (m_wxwindow)
- window = m_wxwindow->window;
+ window = gtk_widget_get_window(m_wxwindow);
return window;
}
// this is called if we attempted to freeze unrealized widget when it finally
// is realized (and so can be frozen):
-static void wx_frozen_widget_realize(GtkWidget* w, void* WXUNUSED(data))
+static void wx_frozen_widget_realize(GtkWidget* w, wxWindowGTK* win)
{
- wxASSERT( w && !GTK_WIDGET_NO_WINDOW(w) );
- wxASSERT( GTK_WIDGET_REALIZED(w) );
+ wxASSERT( w && gtk_widget_get_has_window(w) );
+ wxASSERT( gtk_widget_get_realized(w) );
g_signal_handlers_disconnect_by_func
(
w,
(void*)wx_frozen_widget_realize,
- NULL
+ win
);
- gdk_window_freeze_updates(w->window);
+ GdkWindow* window;
+ if (w == win->m_wxwindow)
+ window = win->GTKGetDrawingWindow();
+ else
+ window = gtk_widget_get_window(w);
+ gdk_window_freeze_updates(window);
}
} // extern "C"
void wxWindowGTK::GTKFreezeWidget(GtkWidget *w)
{
- if ( !w || GTK_WIDGET_NO_WINDOW(w) )
+ if ( !w || !gtk_widget_get_has_window(w) )
return; // window-less widget, cannot be frozen
- if ( !GTK_WIDGET_REALIZED(w) )
+ GdkWindow* window = gtk_widget_get_window(w);
+ if (window == NULL)
{
// we can't thaw unrealized widgets because they don't have GdkWindow,
// so set it up to be done immediately after realization:
w,
"realize",
G_CALLBACK(wx_frozen_widget_realize),
- NULL
+ this
);
return;
}
- gdk_window_freeze_updates(w->window);
+ if (w == m_wxwindow)
+ window = GTKGetDrawingWindow();
+ gdk_window_freeze_updates(window);
}
void wxWindowGTK::GTKThawWidget(GtkWidget *w)
{
- if ( !w || GTK_WIDGET_NO_WINDOW(w) )
+ if ( !w || !gtk_widget_get_has_window(w) )
return; // window-less widget, cannot be frozen
- if ( !GTK_WIDGET_REALIZED(w) )
+ GdkWindow* window = gtk_widget_get_window(w);
+ if (window == NULL)
{
// the widget wasn't realized yet, no need to thaw
g_signal_handlers_disconnect_by_func
(
w,
(void*)wx_frozen_widget_realize,
- NULL
+ this
);
return;
}
- gdk_window_thaw_updates(w->window);
+ if (w == m_wxwindow)
+ window = GTKGetDrawingWindow();
+ gdk_window_thaw_updates(window);
}
void wxWindowGTK::DoFreeze()
projects / wxWidgets.git / blobdiff