// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "window.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/dialog.h"
#include "wx/msgdlg.h"
#include "wx/module.h"
+#include "wx/combobox.h"
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#include "wx/settings.h"
#include "wx/log.h"
#include "wx/fontutil.h"
+#include "wx/stattext.h"
#ifdef __WXDEBUG__
#include "wx/thread.h"
#endif
-#include <math.h>
+#include "wx/math.h"
#include <ctype.h>
#include "wx/gtk/private.h"
#include "wx/gtk/win_gtk.h"
-#ifdef __WXGTK20__
#include <pango/pangox.h>
-#endif
-#ifdef __WXGTK20__
- #define SET_CONTAINER_FOCUS(w, d) gtk_widget_child_focus((w), (d))
-#else
- #define SET_CONTAINER_FOCUS(w, d) gtk_container_focus(GTK_CONTAINER(w), (d))
-#endif
-
-#ifdef __WXGTK20__
- #ifdef HAVE_XIM
- #undef HAVE_XIM
- #endif
+#ifdef HAVE_XIM
+ #undef HAVE_XIM
#endif
-#ifdef __WXGTK20__
extern GtkContainerClass *pizza_parent_class;
-#endif
//-----------------------------------------------------------------------------
// documentation on internals
All windows must have a widget, with which they interact with other under-
lying GTK widgets. It is this widget, e.g. that has to be resized etc and
- thw wxWindow class has a member variable called m_widget which holds a
+ the wxWindow class has a member variable called m_widget which holds a
pointer to this widget. When the window class represents a GTK native widget,
this is (in most cases) the only GTK widget the class manages. E.g. the
wxStaticText class handles only a GtkLabel widget a pointer to which you
III)
- Singularily the most broken code in GTK is the code that is supposes to
+ Singularily the most broken code in GTK is the code that is supposed to
inform subwindows (child windows) about new positions. Very often, duplicate
events are sent without changes in size or position, equally often no
events are sent at all (All this is due to a bug in the GtkContainer code
which got fixed in GTK 1.2.6). For that reason, wxGTK completely ignores
GTK's own system and it simply waits for size events for toplevel windows
and then iterates down the respective size events to all window. This has
- the disadvantage, that windows might get size events before the GTK widget
+ the disadvantage that windows might get size events before the GTK widget
actually has the reported size. This doesn't normally pose any problem, but
- the OpenGl drawing routines rely on correct behaviour. Therefore, I have
+ the OpenGL drawing routines rely on correct behaviour. Therefore, I have
added the m_nativeSizeEvents flag, which is true only for the OpenGL canvas,
i.e. the wxGLCanvas will emit a size event, when (and not before) the X11
- window that is used for OpenGl output really has that size (as reported by
+ window that is used for OpenGL output really has that size (as reported by
GTK).
IV)
If someone at some point of time feels the immense desire to have a look at,
- change or attempt to optimse the Refresh() logic, this person will need an
- intimate understanding of what a "draw" and what an "expose" events are and
- what there are used for, in particular when used in connection with GTK's
+ change or attempt to optimise the Refresh() logic, this person will need an
+ intimate understanding of what "draw" and "expose" events are and what
+ they are used for, in particular when used in connection with GTK's
own windowless widgets. Beware.
V)
and ending with the youngest generation (speaking of parent and 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
+ 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 bool g_captureWindowHasMouse = FALSE;
+static bool g_captureWindowHasMouse = false;
-/* extern */ wxWindowGTK *g_focusWindow = (wxWindowGTK*) NULL;
+wxWindowGTK *g_focusWindow = (wxWindowGTK*) NULL;
// the last window which had the focus - this is normally never NULL (except
// if we never had focus at all) as even when g_focusWindow is NULL it still
// keeps its previous value
-static wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL;
-
-// the frame that is currently active (i.e. its child has focus). It is
-// used to generate wxActivateEvents
-static wxWindowGTK *g_activeFrame = (wxWindowGTK*) NULL;
-static bool g_activeFrameLostFocus = FALSE;
+wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL;
// If a window get the focus set but has not been realized
// yet, defer setting the focus to idle time.
wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL;
-// if we detect that the app has got/lost the focus, we set this variable to
-// either TRUE or FALSE and an activate event will be sent during the next
-// OnIdle() call and it is reset to -1: this value means that we shouldn't
-// send any activate events at all
-static int g_sendActivateEvent = -1;
-
-// hack: we need something to pass to gtk_menu_popup, so we store the time of
-// the last click here
-static guint32 gs_timeLastClick = 0;
-
extern bool g_mainThreadLocked;
//-----------------------------------------------------------------------------
gint x,
gint y)
{
-#ifndef __WXGTK20__
- GdkWindowPrivate *priv;
-#endif
-
if (!window)
window = GDK_ROOT_PARENT();
-#ifdef __WXGTK20__
if (!GDK_WINDOW_DESTROYED(window))
{
XWarpPointer (GDK_WINDOW_XDISPLAY(window),
0, 0, 0, 0, /* not source window -> move from anywhere */
x, y );
}
-#else
- priv = (GdkWindowPrivate*) window;
-
- if (!priv->destroyed)
- {
- XWarpPointer (priv->xdisplay,
- None, /* not source window -> move from anywhere */
- priv->xwindow, /* dest window */
- 0, 0, 0, 0, /* not source window -> move from anywhere */
- x, y );
- }
-#endif
}
//-----------------------------------------------------------------------------
dh += hscroll_req.height;
dh += scroll_class->scrollbar_spacing;
}
-}
+ }
int dx = 0;
int dy = 0;
if (win->HasFlag(wxRAISED_BORDER))
{
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_OUT,
- dx, dy,
- widget->allocation.width-dw, widget->allocation.height-dh );
+ gtk_paint_shadow (widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_OUT,
+ NULL, NULL, NULL, // FIXME: No clipping?
+ dx, dy,
+ widget->allocation.width-dw, widget->allocation.height-dh );
return;
}
if (win->HasFlag(wxSUNKEN_BORDER))
{
- gtk_draw_shadow( widget->style,
- widget->window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_IN,
- dx, dy,
- widget->allocation.width-dw, widget->allocation.height-dh );
+ gtk_paint_shadow (widget->style,
+ widget->window,
+ GTK_STATE_NORMAL,
+ GTK_SHADOW_IN,
+ NULL, NULL, NULL, // FIXME: No clipping?
+ dx, dy,
+ widget->allocation.width-dw, widget->allocation.height-dh );
return;
}
// "expose_event" of m_widget
//-----------------------------------------------------------------------------
-gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindowGTK *win )
+extern "C" {
+static gint gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindowGTK *win )
{
if (gdk_event->count > 0) return FALSE;
draw_frame( widget, win );
-#ifdef __WXGTK20__
-
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
-#endif
return TRUE;
}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_widget
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-
-static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindowGTK *win )
-{
- draw_frame( widget, win );
}
-#endif // GTK+ < 2.0
-
//-----------------------------------------------------------------------------
// "size_request" of m_widget
//-----------------------------------------------------------------------------
-// make it extern because wxStatitText needs to disconnect this one
-extern "C"
+// make it extern because wxStaticText needs to disconnect this one
+extern "C" {
void wxgtk_window_size_request_callback(GtkWidget *widget,
GtkRequisition *requisition,
wxWindow *win)
requisition->height = h;
requisition->width = w;
}
+}
+
+extern "C" {
+static
+void wxgtk_combo_size_request_callback(GtkWidget *widget,
+ GtkRequisition *requisition,
+ wxComboBox *win)
+{
+ // This callback is actually hooked into the text entry
+ // of the combo box, not the GtkHBox.
+
+ int w, h;
+ win->GetSize( &w, &h );
+ if (w < 2)
+ w = 2;
+ if (h < 2)
+ h = 2;
+
+ GtkCombo *gcombo = GTK_COMBO(win->m_widget);
+
+ GtkRequisition entry_req;
+ entry_req.width = 2;
+ entry_req.height = 2;
+ (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(gcombo->button) )->size_request )
+ (gcombo->button, &entry_req );
+
+ requisition->width = w - entry_req.width;
+ requisition->height = entry_req.height;
+}
+}
//-----------------------------------------------------------------------------
// "expose_event" of m_wxwindow
//-----------------------------------------------------------------------------
+extern "C" {
static int gtk_window_expose_callback( GtkWidget *widget,
GdkEventExpose *gdk_event,
wxWindow *win )
if (g_isIdle)
wxapp_install_idle_handler();
-#ifdef __WXGTK20__
// This callback gets called in drawing-idle time under
// GTK 2.0, so we don't need to defer anything to idle
// time anymore.
(int)gdk_event->area.width,
(int)gdk_event->area.height );
}
-
+
gtk_paint_box
(
win->m_wxwindow->style,
win->GtkSendPaintEvents();
- // Let parent window draw window less widgets
+ // Let parent window draw window-less widgets
(* GTK_WIDGET_CLASS (pizza_parent_class)->expose_event) (widget, gdk_event);
-#else
- // This gets called immediately after an expose event
- // under GTK 1.2 so we collect the calls and wait for
- // the idle handler to pick things up.
-
- win->GetUpdateRegion().Union( gdk_event->area.x,
- gdk_event->area.y,
- gdk_event->area.width,
- gdk_event->area.height );
- win->m_clearRegion.Union( gdk_event->area.x,
- gdk_event->area.y,
- gdk_event->area.width,
- gdk_event->area.height );
-
- // Actual redrawing takes place in idle time.
- // win->GtkUpdate();
-#endif
-
- return FALSE;
-}
-
-//-----------------------------------------------------------------------------
-// "event" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-// GTK thinks it is clever and filters out a certain amount of "unneeded"
-// expose events. We need them, of course, so we override the main event
-// procedure in GtkWidget by giving our own handler for all system events.
-// There, we look for expose events ourselves whereas all other events are
-// handled normally.
-
-gint gtk_window_event_event_callback( GtkWidget *widget,
- GdkEventExpose *event,
- wxWindow *win )
-{
- if (event->type == GDK_EXPOSE)
- {
- gint ret = gtk_window_expose_callback( widget, event, win );
- return ret;
- }
return FALSE;
}
-
-//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-#ifndef __WXGTK20__
-
-// This callback is a complete replacement of the gtk_pizza_draw() function,
-// which is disabled.
-
-static void gtk_window_draw_callback( GtkWidget *widget,
- GdkRectangle *rect,
- wxWindow *win )
-{
- DEBUG_MAIN_THREAD
-
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- // if there are any children we must refresh everything
- //
- // VZ: why?
- if ( !win->HasFlag(wxFULL_REPAINT_ON_RESIZE) &&
- win->GetChildren().IsEmpty() )
- {
- return;
- }
-
-#if 0
- if (win->GetName())
- {
- wxPrintf( wxT("OnDraw from ") );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- wxPrintf( win->GetClassInfo()->GetClassName() );
- wxPrintf( wxT(" %d %d %d %d\n"), (int)rect->x,
- (int)rect->y,
- (int)rect->width,
- (int)rect->height );
- }
-#endif
-
-#ifndef __WXUNIVERSAL__
- GtkPizza *pizza = GTK_PIZZA (widget);
-
- if (win->GetThemeEnabled())
- {
- wxWindow *parent = win->GetParent();
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
- if (!parent)
- parent = win;
-
- gtk_paint_flat_box (parent->m_widget->style,
- pizza->bin_window,
- GTK_STATE_NORMAL,
- GTK_SHADOW_NONE,
- rect,
- parent->m_widget,
- (char *)"base",
- 0, 0, -1, -1);
- }
-#endif
-
- win->m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height );
- win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height );
-
- // Update immediately, not in idle time.
- win->GtkUpdate();
-
-#ifndef __WXUNIVERSAL__
- // Redraw child widgets
- GList *children = pizza->children;
- while (children)
- {
- GtkPizzaChild *child = (GtkPizzaChild*) children->data;
- children = children->next;
-
- GdkRectangle child_area;
- if (gtk_widget_intersect (child->widget, rect, &child_area))
- {
- gtk_widget_draw (child->widget, &child_area /* (GdkRectangle*) NULL*/ );
- }
- }
-#endif
}
-#endif
-
//-----------------------------------------------------------------------------
// "key_press_event" from any window
//-----------------------------------------------------------------------------
return ks < 256;
}
+static void wxFillOtherKeyEventFields(wxKeyEvent& event,
+ wxWindowGTK *win,
+ GdkEventKey *gdk_event)
+{
+ int x = 0;
+ int y = 0;
+ GdkModifierType state;
+ if (gdk_event->window)
+ gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+
+ 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_rawCode = (wxUint32) gdk_event->keyval;
+ event.m_rawFlags = 0;
+#if wxUSE_UNICODE
+ event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval);
+ if ( gdk_event->type == GDK_KEY_PRESS || gdk_event->type == GDK_KEY_RELEASE )
+ {
+ event.m_uniChar = toupper(event.m_uniChar);
+ }
+#endif
+ wxGetMousePosition( &x, &y );
+ win->ScreenToClient( &x, &y );
+ event.m_x = x;
+ event.m_y = y;
+ event.SetEventObject( win );
+}
+
+
static bool
wxTranslateGTKKeyEventToWx(wxKeyEvent& event,
wxWindowGTK *win,
: _T("press"),
keysym);
- long key_code = wxTranslateKeySymToWXKey(keysym, FALSE /* !isChar */);
+ long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */);
if ( !key_code )
{
}
// we want to always get the same key code when the same key is
- // pressed regardless of the state of the modifies, i.e. on a
+ // pressed regardless of the state of the modifiers, i.e. on a
// standard US keyboard pressing '5' or '%' ('5' key with
// Shift) should result in the same key code in OnKeyDown():
// '5' (although OnChar() will get either '5' or '%').
// sending unknown key events doesn't really make sense
if ( !key_code )
- return FALSE;
+ return false;
// now fill all the other fields
- int x = 0;
- int y = 0;
- GdkModifierType state;
- if (gdk_event->window)
- gdk_window_get_pointer(gdk_event->window, &x, &y, &state);
+ wxFillOtherKeyEventFields(event, win, gdk_event);
- event.SetTimestamp( gdk_event->time );
- 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_keyCode = key_code;
- event.m_scanCode = gdk_event->keyval;
- event.m_rawCode = (wxUint32) gdk_event->keyval;
- event.m_rawFlags = 0;
- event.m_x = x;
- event.m_y = y;
- event.SetEventObject( win );
- return TRUE;
+ return true;
}
+struct wxGtkIMData
+{
+ GtkIMContext *context;
+ GdkEventKey *lastKeyEvent;
+
+ wxGtkIMData()
+ {
+ context = gtk_im_multicontext_new();
+ lastKeyEvent = NULL;
+ }
+ ~wxGtkIMData()
+ {
+ g_object_unref(context);
+ }
+};
+
+extern "C" {
static gint gtk_window_key_press_callback( GtkWidget *widget,
GdkEventKey *gdk_event,
wxWindow *win )
wxKeyEvent event( wxEVT_KEY_DOWN );
- if ( !wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
+ bool ret = false;
+ bool return_after_IM = false;
+
+ if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{
- // unknown key pressed, ignore (the event would be useless anyhow)
- return FALSE;
+ // Emit KEY_DOWN event
+ ret = win->GetEventHandler()->ProcessEvent( event );
+ }
+ else
+ {
+ // Return after IM processing as we cannot do
+ // anything with it anyhow.
+ return_after_IM = true;
+ }
+
+ // 2005.01.26 modified by Hong Jen Yee (hzysoft@sina.com.tw):
+ // When we get a key_press event here, it could be originate
+ // from the current widget or its child widgets. However, only the widget
+ // with the INPUT FOCUS can generate the INITIAL key_press event. That is,
+ // if the CURRENT widget doesn't have the FOCUS at all, this event definitely
+ // originated from its child widgets and shouldn't be passed to IM context.
+ // In fact, what a GTK+ IM should do is filtering keyEvents and convert them
+ // into text input ONLY WHEN THE WIDGET HAS INPUT FOCUS. Besides, when current
+ // widgets has both IM context and input focus, the event should be filtered
+ // by gtk_im_context_filter_keypress().
+ // Then, we should, according to GTK+ 2.0 API doc, return whatever it returns.
+ if ((!ret) && (win->m_imData != NULL) && ( wxWindow::FindFocus() == win ))
+ {
+ // 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.
+ bool intercepted_by_IM = gtk_im_context_filter_keypress(win->m_imData->context, gdk_event);
+ win->m_imData->lastKeyEvent = NULL;
+ if (intercepted_by_IM)
+ {
+ wxLogTrace(TRACE_KEYS, _T("Key event intercepted by IM"));
+ return true;
+ }
}
- // Emit KEY_DOWN event
- bool ret = win->GetEventHandler()->ProcessEvent( event );
+ if (return_after_IM)
+ return false;
#if wxUSE_ACCEL
if (!ret)
{
long key_code;
KeySym keysym = gdk_event->keyval;
-#ifdef __WXGTK20__
- // In GTK 2.0, we need to hand over the key event to an input method
- // and the IM will emit a "commit" event containing the actual utf8
- // character. In that case the EVT_CHAR events will be sent from
- // there. But only do it this way for non-KeySym keys.
- key_code = wxTranslateKeySymToWXKey(gdk_event->keyval, FALSE /* isChar */);
- if ( !key_code && win->m_imContext )
- {
- gtk_im_context_filter_keypress ( (GtkIMContext*) win->m_imContext, gdk_event );
- ret = TRUE;
- }
- else
-#endif
+ // Find key code for EVT_CHAR and EVT_CHAR_HOOK events
+ key_code = wxTranslateKeySymToWXKey(keysym, true /* isChar */);
+ if ( !key_code )
{
- // Find key code for EVT_CHAR and EVT_CHAR_HOOK events
- key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */);
- if ( !key_code )
+ if ( wxIsAsciiKeysym(keysym) )
{
- if ( gdk_event->length == 1 )
- {
- key_code = (unsigned char)gdk_event->string[0];
- }
- else if ( wxIsAsciiKeysym(keysym) )
- {
- // ASCII key
- key_code = (unsigned char)keysym;
- }
+ // ASCII key
+ key_code = (unsigned char)keysym;
}
-
- if ( key_code )
+ // gdk_event->string is actually deprecated
+ else if ( gdk_event->length == 1 )
{
- wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code);
+ key_code = (unsigned char)gdk_event->string[0];
+ }
+ }
- event.m_keyCode = key_code;
+ if ( key_code )
+ {
+ wxLogTrace(TRACE_KEYS, _T("Char event: %ld"), key_code);
- // Implement OnCharHook by checking ancesteror top level windows
- wxWindow *parent = win;
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
- if (parent)
- {
- event.SetEventType( wxEVT_CHAR_HOOK );
- ret = parent->GetEventHandler()->ProcessEvent( event );
- }
+ event.m_keyCode = key_code;
- if (!ret)
- {
- event.SetEventType(wxEVT_CHAR);
- ret = win->GetEventHandler()->ProcessEvent( event );
- }
+ // To conform to the docs we need to translate Ctrl-alpha
+ // characters to values in the range 1-26.
+ if (event.ControlDown() && key_code >= 'a' && key_code <= 'z' )
+ {
+ event.m_keyCode = key_code - 'a' + 1;
+#if wxUSE_UNICODE
+ event.m_uniChar = event.m_keyCode;
+#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->GetEventHandler()->ProcessEvent( event );
+ }
+
+ if (!ret)
+ {
+ event.SetEventType(wxEVT_CHAR);
+ ret = win->GetEventHandler()->ProcessEvent( event );
}
}
}
+
+
+
+
// win is a control: tab can be propagated up
if ( !ret &&
((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab)) &&
-// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here the control may
+// VZ: testing for wxTE_PROCESS_TAB shouldn't be done here - the control may
// have this style, yet choose not to process this particular TAB in which
// case TAB must still work as a navigational character
// JS: enabling again to make consistent with other platforms
if ( btnCancel )
{
- wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
- event.SetEventObject(btnCancel);
- ret = btnCancel->GetEventHandler()->ProcessEvent(event);
+ wxCommandEvent eventClick(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
+ eventClick.SetEventObject(btnCancel);
+ ret = btnCancel->GetEventHandler()->ProcessEvent(eventClick);
}
}
if (ret)
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+ g_signal_stop_emission_by_name (widget, "key_press_event");
return TRUE;
}
return FALSE;
}
+}
-#ifdef __WXGTK20__
+extern "C" {
static void gtk_wxwindow_commit_cb (GtkIMContext *context,
const gchar *str,
wxWindow *window)
{
- bool ret = FALSE;
-
wxKeyEvent event( wxEVT_KEY_DOWN );
-#if wxUSE_UNICODE
- event.m_uniChar = g_utf8_get_char( str );
+ // take modifiers, cursor position, timestamp etc. from the last
+ // key_press_event that was fed into Input Method:
+ if (window->m_imData->lastKeyEvent)
+ {
+ wxFillOtherKeyEventFields(event,
+ window, window->m_imData->lastKeyEvent);
+ }
- // Backward compatible for ISO-8859
- if (event.m_uniChar < 256)
- event.m_keyCode = event.m_uniChar;
+#if wxUSE_UNICODE
+ const wxWCharBuffer data = wxConvUTF8.cMB2WC( (char*)str );
#else
- gunichar uniChar = g_utf8_get_char( str );
- // We cannot handle Unicode in non-Unicode mode
- if (uniChar > 255) return;
-
- event.m_keyCode = uniChar;
-#endif
-
-
- // TODO: We still need to set all the extra attributes of the
- // event, modifiers and such...
+ const wxWCharBuffer wdata = wxConvUTF8.cMB2WC( (char*)str );
+ const wxCharBuffer data = wxConvLocal.cWC2MB( wdata );
+#endif // wxUSE_UNICODE
+ if( !(const wxChar*)data )
+ return;
+ bool ret = false;
// Implement OnCharHook by checking ancestor top level windows
wxWindow *parent = window;
while (parent && !parent->IsTopLevel())
parent = parent->GetParent();
- if (parent)
- {
- event.SetEventType( wxEVT_CHAR_HOOK );
- ret = parent->GetEventHandler()->ProcessEvent( event );
- }
- if (!ret)
+ for( const wxChar* pstr = data; *pstr; pstr++ )
{
- event.SetEventType(wxEVT_CHAR);
- ret = window->GetEventHandler()->ProcessEvent( event );
+#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);
+#else
+ event.m_keyCode = *pstr;
+#endif // wxUSE_UNICODE
+
+ // To conform to the docs we need to translate Ctrl-alpha
+ // characters to values in the range 1-26.
+ if (event.ControlDown() && *pstr >= 'a' && *pstr <= 'z' )
+ {
+ event.m_keyCode = *pstr - 'a' + 1;
+#if wxUSE_UNICODE
+ event.m_uniChar = event.m_keyCode;
+#endif
+ }
+
+ if (parent)
+ {
+ event.SetEventType( wxEVT_CHAR_HOOK );
+ ret = parent->GetEventHandler()->ProcessEvent( event );
+ }
+
+ if (!ret)
+ {
+ event.SetEventType(wxEVT_CHAR);
+ ret = window->GetEventHandler()->ProcessEvent( event );
+ }
}
}
-#endif
+}
//-----------------------------------------------------------------------------
// "key_release_event" from any window
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_key_release_callback( GtkWidget *widget,
GdkEventKey *gdk_event,
wxWindowGTK *win )
wxKeyEvent event( wxEVT_KEY_UP );
if ( !wxTranslateGTKKeyEventToWx(event, win, gdk_event) )
{
- // unknown key pressed, ignore (the event would be useless anyhow
+ // unknown key pressed, ignore (the event would be useless anyhow)
return FALSE;
}
if ( !win->GetEventHandler()->ProcessEvent( event ) )
return FALSE;
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_release_event" );
+ g_signal_stop_emission_by_name (widget, "key_release_event");
return TRUE;
}
+}
// ============================================================================
// the mouse events
if (event.GetEventType() == wxEVT_MOUSEWHEEL)
{
event.m_linesPerAction = 3;
+ event.m_wheelDelta = 120;
if (((GdkEventButton*)gdk_event)->button == 4)
event.m_wheelRotation = 120;
else if (((GdkEventButton*)gdk_event)->button == 5)
// "button_press_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_button_press_callback( GtkWidget *widget,
GdkEventButton *gdk_event,
wxWindowGTK *win )
*/
}
- // GDK sends surplus button down event
+ // GDK sends surplus button down events
// before a double click event. We
// need to filter these out.
if (gdk_event->type == GDK_BUTTON_PRESS)
wxEventType event_type = wxEVT_NULL;
- // GdkDisplay is a GTK+ 2.1.0 thing
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
+ // GdkDisplay is a GTK+ 2.2.0 thing
+#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0)
if ( gdk_event->type == GDK_2BUTTON_PRESS &&
+ !gtk_check_version(2,2,0) &&
gdk_event->button >= 1 && gdk_event->button <= 3 )
{
// Reset GDK internal timestamp variables in order to disable GDK
AdjustEventButtonState(event);
- // wxListBox actually get mouse events from the item, so we need to give it
+ // 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 too: it may be a different one
- // from the one which got it at GTK+ level because some control don't have
+ // 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.
if ( !g_captureWindow )
win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
- gs_timeLastClick = gdk_event->time;
-
-/*
- wxPrintf( wxT("2) OnButtonPress from ") );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- wxPrintf( win->GetClassInfo()->GetClassName() );
- wxPrintf( wxT(".\n") );
-*/
-
-#ifndef __WXGTK20__
- if (event_type == wxEVT_LEFT_DCLICK)
+ if (win->GetEventHandler()->ProcessEvent( event ))
{
- // GTK 1.2 crashes when intercepting double
- // click events from both wxSpinButton and
- // wxSpinCtrl
- if (GTK_IS_SPIN_BUTTON(win->m_widget))
- {
- // Just disable this event for now.
- return FALSE;
- }
+ g_signal_stop_emission_by_name (widget, "button_press_event");
+ return TRUE;
}
-#endif
- if (win->GetEventHandler()->ProcessEvent( event ))
+ if (event_type == wxEVT_RIGHT_DOWN)
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" );
- return TRUE;
+ // generate a "context menu" event: this is similar to right mouse
+ // click under many GUIs except that it is generated differently
+ // (right up under MSW, ctrl-click under Mac, right down here) and
+ //
+ // (a) it's a command event and so is propagated to the parent
+ // (b) under some ports it can be generated from kbd too
+ // (c) it uses screen coords (because of (a))
+ wxContextMenuEvent evtCtx(
+ wxEVT_CONTEXT_MENU,
+ win->GetId(),
+ win->ClientToScreen(event.GetPosition()));
+ evtCtx.SetEventObject(win);
+ return win->GetEventHandler()->ProcessEvent(evtCtx);
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "button_release_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_button_release_callback( GtkWidget *widget,
GdkEventButton *gdk_event,
wxWindowGTK *win )
// same wxListBox hack as above
win->FixUpMouseEvent(widget, event.m_x, event.m_y);
- if ( event_type == wxEVT_RIGHT_UP )
- {
- // generate a "context menu" event: this is similar to wxEVT_RIGHT_UP
- // except that:
- //
- // (a) it's a command event and so is propagated to the parent
- // (b) under MSW it can be generated from kbd too
- // (c) it uses screen coords (because of (a))
- wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU,
- win->GetId(),
- win->ClientToScreen(event.GetPosition()));
- (void)win->GetEventHandler()->ProcessEvent(evtCtx);
- }
-
if ( !g_captureWindow )
win = FindWindowForMouseEvent(win, event.m_x, event.m_y);
if (win->GetEventHandler()->ProcessEvent( event ))
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" );
+ g_signal_stop_emission_by_name (widget, "button_release_event");
return TRUE;
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "motion_notify_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_motion_notify_callback( GtkWidget *widget,
GdkEventMotion *gdk_event,
wxWindowGTK *win )
// the mouse changed window
g_captureWindowHasMouse = hasMouse;
- wxMouseEvent event(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW
- : wxEVT_LEAVE_WINDOW);
- InitMouseEvent(win, event, gdk_event);
- event.SetEventObject(win);
- win->GetEventHandler()->ProcessEvent(event);
+ wxMouseEvent eventM(g_captureWindowHasMouse ? wxEVT_ENTER_WINDOW
+ : wxEVT_LEAVE_WINDOW);
+ InitMouseEvent(win, eventM, gdk_event);
+ eventM.SetEventObject(win);
+ win->GetEventHandler()->ProcessEvent(eventM);
}
}
else // no capture
if (win->GetEventHandler()->ProcessEvent( event ))
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" );
+ g_signal_stop_emission_by_name (widget, "motion_notify_event");
return TRUE;
}
return FALSE;
}
+}
-#ifdef __WXGTK20__
//-----------------------------------------------------------------------------
// "mouse_wheel_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_wheel_callback (GtkWidget * widget,
- GdkEventScroll * gdk_event,
- wxWindowGTK * win)
+ GdkEventScroll * gdk_event,
+ wxWindowGTK * win)
{
DEBUG_MAIN_THREAD
event_type = wxEVT_MOUSEWHEEL;
else
return FALSE;
-
+
wxMouseEvent event( event_type );
// Can't use InitMouse macro because scroll events don't have button
event.SetTimestamp( gdk_event->time );
event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK);
event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK);
event.m_linesPerAction = 3;
+ event.m_wheelDelta = 120;
if (gdk_event->direction == GDK_SCROLL_UP)
event.m_wheelRotation = 120;
else
event.SetEventObject( win );
event.SetId( win->GetId() );
event.SetTimestamp( gdk_event->time );
-
+
if (win->GetEventHandler()->ProcessEvent( event ))
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "scroll_event" );
+ g_signal_stop_emission_by_name (widget, "scroll_event");
return TRUE;
}
return FALSE;
}
-#endif
+}
+
+//-----------------------------------------------------------------------------
+// "popup-menu"
+//-----------------------------------------------------------------------------
+extern "C" {
+static gboolean wxgtk_window_popup_menu_callback(GtkWidget*, wxWindowGTK* win)
+{
+ wxContextMenuEvent event(
+ wxEVT_CONTEXT_MENU,
+ win->GetId(),
+ wxPoint(-1, -1));
+ event.SetEventObject(win);
+ return win->GetEventHandler()->ProcessEvent(event);
+}
+}
//-----------------------------------------------------------------------------
// "focus_in_event"
return win->GetEventHandler()->ProcessEvent(eventFocus);
}
+extern "C" {
static gint gtk_window_focus_in_callback( GtkWidget *widget,
GdkEvent *WXUNUSED(event),
wxWindow *win )
if (g_isIdle)
wxapp_install_idle_handler();
- if (!win->m_hasVMT) return FALSE;
- if (g_blockEventsOnDrag) return FALSE;
-
- switch ( g_sendActivateEvent )
- {
- case -1:
- // we've got focus from outside, synthetize wxActivateEvent
- g_sendActivateEvent = 1;
- break;
-
- case 0:
- // another our window just lost focus, it was already ours before
- // - don't send any wxActivateEvent
- g_sendActivateEvent = -1;
- break;
- }
+ if (win->m_imData)
+ gtk_im_context_focus_in(win->m_imData->context);
g_focusWindowLast =
g_focusWindow = win;
}
#endif // wxUSE_CARET
- g_activeFrameLostFocus = FALSE;
-
- wxWindowGTK *active = wxGetTopLevelParent(win);
- if ( active != g_activeFrame )
- {
- if ( g_activeFrame )
- {
- wxLogTrace(wxT("activate"), wxT("Deactivating frame %p (from focus_in)"), g_activeFrame);
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
- event.SetEventObject(g_activeFrame);
- g_activeFrame->GetEventHandler()->ProcessEvent(event);
- }
-
- wxLogTrace(wxT("activate"), wxT("Activating frame %p (from focus_in)"), active);
- g_activeFrame = active;
- wxActivateEvent event(wxEVT_ACTIVATE, TRUE, g_activeFrame->GetId());
- event.SetEventObject(g_activeFrame);
- g_activeFrame->GetEventHandler()->ProcessEvent(event);
-
- // Don't send focus events in addition to activate
- // if (win == g_activeFrame)
- // return TRUE;
- }
-
// does the window itself think that it has the focus?
if ( !win->m_hasFocus )
{
// not yet, notify it
- win->m_hasFocus = TRUE;
+ win->m_hasFocus = true;
if ( DoSendFocusEvents(win) )
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" );
+ g_signal_stop_emission_by_name (widget, "focus_in_event");
return TRUE;
}
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "focus_out_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
{
DEBUG_MAIN_THREAD
if (g_isIdle)
wxapp_install_idle_handler();
- if (!win->m_hasVMT) return FALSE;
- if (g_blockEventsOnDrag) return FALSE;
+ if (win->m_imData)
+ gtk_im_context_focus_out(win->m_imData->context);
wxLogTrace( TRACE_FOCUS,
_T("%s: focus out"), win->GetName().c_str() );
- if ( !g_activeFrameLostFocus && g_activeFrame )
- {
- // VZ: commenting this out because it does happen (although not easy
- // to reproduce, I only see it when using wxMiniFrame and not
- // always) and makes using Mahogany quite annoying
-#if 0
- wxASSERT_MSG( wxGetTopLevelParent(win) == g_activeFrame,
- wxT("unfocusing window that hasn't gained focus properly") );
-#endif // 0
-
- g_activeFrameLostFocus = TRUE;
- }
-
- // if the focus goes out of our app alltogether, OnIdle() will send
- // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset
- // g_sendActivateEvent to -1
- g_sendActivateEvent = 0;
wxWindowGTK *winFocus = wxFindFocusedChild(win);
if ( winFocus )
// have focus already
if ( win->m_hasFocus )
{
- win->m_hasFocus = FALSE;
+ win->m_hasFocus = false;
wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
event.SetEventObject( win );
- if (win->GetEventHandler()->ProcessEvent( event ))
- {
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" );
- return TRUE;
- }
+ // even if we did process the event in wx code, still let GTK itself
+ // process it too as otherwise bad things happen, especially in GTK2
+ // where the text control simply aborts the program if it doesn't get
+ // the matching focus out event
+ (void)win->GetEventHandler()->ProcessEvent( event );
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "enter_notify_event"
//-----------------------------------------------------------------------------
+extern "C" {
static
gint gtk_window_enter_callback( GtkWidget *widget,
GdkEventCrossing *gdk_event,
if (win->GetEventHandler()->ProcessEvent( event ))
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "enter_notify_event" );
+ g_signal_stop_emission_by_name (widget, "enter_notify_event");
return TRUE;
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "leave_notify_event"
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindowGTK *win )
{
DEBUG_MAIN_THREAD
if (win->GetEventHandler()->ProcessEvent( event ))
{
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "leave_notify_event" );
+ g_signal_stop_emission_by_name (widget, "leave_notify_event");
return TRUE;
}
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "value_changed" from m_vAdjust
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_window_vscroll_callback( GtkAdjustment *adjust,
- SCROLLBAR_CBACK_ARG
wxWindowGTK *win )
{
DEBUG_MAIN_THREAD
win->m_oldVerticalPos = adjust->value;
-#ifndef __WXGTK20__
- GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget);
-#endif
- wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->vscrollbar));
+ wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP);
int value = (int)(adjust->value+0.5);
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// "value_changed" from m_hAdjust
//-----------------------------------------------------------------------------
+extern "C" {
static void gtk_window_hscroll_callback( GtkAdjustment *adjust,
- SCROLLBAR_CBACK_ARG
wxWindowGTK *win )
{
DEBUG_MAIN_THREAD
float diff = adjust->value - win->m_oldHorizontalPos;
if (fabs(diff) < 0.2) return;
-#ifndef __WXGTK20__
- GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget);
-#endif
- wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->hscrollbar));
+ wxEventType command = GtkScrollWinTypeToWx(GTK_SCROLL_JUMP);
win->m_oldHorizontalPos = adjust->value;
event.SetEventObject( win );
win->GetEventHandler()->ProcessEvent( event );
}
+}
//-----------------------------------------------------------------------------
// "button_press_event" from scrollbar
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_scrollbar_button_press_callback( GtkRange *widget,
GdkEventButton *gdk_event,
wxWindowGTK *win)
wxapp_install_idle_handler();
- g_blockEventsOnScroll = TRUE;
+ g_blockEventsOnScroll = true;
- // FIXME: there is no 'slider' field in GTK+ 2.0 any more
-#ifndef __WXGTK20__
+// FIXME: there is no 'slider' field in GTK+ 2.0 any more
+#if 0
win->m_isScrolling = (gdk_event->window == widget->slider);
#endif
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "button_release_event" from scrollbar
//-----------------------------------------------------------------------------
+extern "C" {
static gint gtk_scrollbar_button_release_callback( GtkRange *widget,
GdkEventButton *WXUNUSED(gdk_event),
wxWindowGTK *win)
//
// if (gdk_event->window != widget->slider) return FALSE;
- g_blockEventsOnScroll = FALSE;
+ g_blockEventsOnScroll = false;
if (win->m_isScrolling)
{
win->GetEventHandler()->ProcessEvent( event );
}
- win->m_isScrolling = FALSE;
+ win->m_isScrolling = false;
return FALSE;
}
+}
// ----------------------------------------------------------------------------
// this wxWindowBase function is implemented here (in platform-specific file)
// because it is static and so couldn't be made virtual
// ----------------------------------------------------------------------------
-wxWindow *wxWindowBase::FindFocus()
+wxWindow *wxWindowBase::DoFindFocus()
{
// the cast is necessary when we compile in wxUniversal mode
return (wxWindow *)g_focusWindow;
}
-
//-----------------------------------------------------------------------------
// "realize" from m_widget
//-----------------------------------------------------------------------------
/* We cannot set colours and fonts before the widget has
been realized, so we do this directly after realization. */
+extern "C" {
static gint
gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
-
-#ifdef __WXGTK20__
- if (win->m_imContext)
+
+ if (win->m_imData)
{
GtkPizza *pizza = GTK_PIZZA( m_widget );
- gtk_im_context_set_client_window( (GtkIMContext*) win->m_imContext, pizza->bin_window );
+ gtk_im_context_set_client_window( win->m_imData->context,
+ pizza->bin_window );
}
-#endif
wxWindowCreateEvent event( win );
event.SetEventObject( win );
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// "size_allocate"
//-----------------------------------------------------------------------------
+extern "C" {
static
void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
GtkAllocation *WXUNUSED(alloc),
win->GetEventHandler()->ProcessEvent( event );
}
}
+}
#ifdef HAVE_XIM
/* Resize XIM window */
+extern "C" {
static
void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget),
GtkAllocation* WXUNUSED_UNLESS_XIM(alloc),
}
#endif // HAVE_XIM
}
+}
//-----------------------------------------------------------------------------
// "realize" from m_wxwindow
/* Initialize XIM support */
+extern "C" {
static gint
gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget),
wxWindowGTK * WXUNUSED_UNLESS_XIM(win) )
return FALSE;
}
+}
//-----------------------------------------------------------------------------
// InsertChild for wxWindowGTK.
return wxWindow::FindFocus();
}
+
+wxMouseState wxGetMouseState()
+{
+ wxMouseState ms;
+
+ gint x;
+ gint y;
+ GdkModifierType mask;
+
+ gdk_window_get_pointer(NULL, &x, &y, &mask);
+
+ 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.SetControlDown(mask & GDK_CONTROL_MASK);
+ ms.SetShiftDown(mask & GDK_SHIFT_MASK);
+ ms.SetAltDown(mask & GDK_MOD1_MASK);
+ ms.SetMetaDown(mask & GDK_MOD2_MASK);
+
+ return ms;
+}
+
//-----------------------------------------------------------------------------
// wxWindowGTK
//-----------------------------------------------------------------------------
m_width = 0;
m_height = 0;
- m_sizeSet = FALSE;
- m_hasVMT = FALSE;
- m_needParent = TRUE;
- m_isBeingDeleted = FALSE;
+ m_sizeSet = false;
+ m_hasVMT = false;
+ m_needParent = true;
+ m_isBeingDeleted = false;
- m_noExpose = FALSE;
- m_nativeSizeEvent = FALSE;
+ m_noExpose = false;
+ m_nativeSizeEvent = false;
- m_hasScrolling = FALSE;
- m_isScrolling = FALSE;
+ m_hasScrolling = false;
+ m_isScrolling = false;
m_hAdjust = (GtkAdjustment*) NULL;
m_vAdjust = (GtkAdjustment*) NULL;
m_oldClientWidth =
m_oldClientHeight = 0;
- m_resizing = FALSE;
+ m_resizing = false;
m_insertCallback = (wxInsertChildFunction) NULL;
- m_acceptsFocus = FALSE;
- m_hasFocus = FALSE;
+ m_acceptsFocus = false;
+ m_hasFocus = false;
+
+ m_clipPaintRegion = false;
- m_clipPaintRegion = FALSE;
+ m_needsStyleChange = false;
m_cursor = *wxSTANDARD_CURSOR;
-#ifdef __WXGTK20__
- m_imContext = NULL;
- m_x11Context = NULL;
-#else
-#ifdef HAVE_XIM
- m_ic = (GdkIC*) NULL;
- m_icattr = (GdkICAttr*) NULL;
-#endif
-#endif
+ m_imData = NULL;
+ m_dirtyTabOrder = false;
}
wxWindowGTK::wxWindowGTK()
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxWindowGTK creation failed") );
- return FALSE;
+ return false;
}
m_insertCallback = wxInsertChildInWindow;
gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow );
GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS );
- m_acceptsFocus = TRUE;
+ m_acceptsFocus = true;
// I _really_ don't want scrollbars in the beginning
m_vAdjust->lower = 0.0;
m_vAdjust->step_increment = 1.0;
m_vAdjust->page_increment = 1.0;
m_vAdjust->page_size = 5.0;
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+ g_signal_emit_by_name (m_vAdjust, "changed");
m_hAdjust->lower = 0.0;
m_hAdjust->upper = 1.0;
m_hAdjust->value = 0.0;
m_hAdjust->step_increment = 1.0;
m_hAdjust->page_increment = 1.0;
m_hAdjust->page_size = 5.0;
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+ g_signal_emit_by_name (m_hAdjust, "changed");
// these handlers block mouse events to any window during scrolling such as
// motion events and prevent GTK and wxWidgets from fighting over where the
// slider should be
-
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_press_event",
- (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_press_event",
- (GtkSignalFunc)gtk_scrollbar_button_press_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->vscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(scrolledWindow->hscrollbar), "button_release_event",
- (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this );
+ g_signal_connect (scrolledWindow->vscrollbar, "button_press_event",
+ G_CALLBACK (gtk_scrollbar_button_press_callback), this);
+ g_signal_connect (scrolledWindow->hscrollbar, "button_press_event",
+ G_CALLBACK (gtk_scrollbar_button_press_callback), this);
+ g_signal_connect (scrolledWindow->vscrollbar, "button_release_event",
+ G_CALLBACK (gtk_scrollbar_button_release_callback), this);
+ g_signal_connect (scrolledWindow->hscrollbar, "button_release_event",
+ G_CALLBACK (gtk_scrollbar_button_release_callback), this);
// these handlers get notified when screen updates are required either when
// scrolling or when the window size (and therefore scrollbar configuration)
// has changed
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
-
-#ifdef __WXGTK20__
- // Create input method handler
- m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new ();
-
- // Cannot handle drawing preedited text yet
- gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE );
-
- g_signal_connect (G_OBJECT (m_imContext), "commit",
- G_CALLBACK (gtk_wxwindow_commit_cb), this);
-#endif
+ g_signal_connect (m_hAdjust, "value_changed",
+ G_CALLBACK (gtk_window_hscroll_callback), this);
+ g_signal_connect (m_vAdjust, "value_changed",
+ G_CALLBACK (gtk_window_vscroll_callback), this);
gtk_widget_show( m_wxwindow );
PostCreation();
- return TRUE;
+ return true;
}
wxWindowGTK::~wxWindowGTK()
if (g_focusWindow == this)
g_focusWindow = NULL;
- if (g_activeFrame == this)
- g_activeFrame = NULL;
-
if ( g_delayedFocus == this )
g_delayedFocus = NULL;
- m_isBeingDeleted = TRUE;
- m_hasVMT = FALSE;
-
- if (m_widget)
- Show( FALSE );
+ m_isBeingDeleted = true;
+ m_hasVMT = false;
+ // destroy children before destroying this window itself
DestroyChildren();
+ // unhook focus handlers to prevent stray events being
+ // propagated to this (soon to be) dead object
+ if (m_focusWidget != NULL)
+ {
+ g_signal_handlers_disconnect_by_func (m_focusWidget,
+ (gpointer) gtk_window_focus_in_callback,
+ this);
+ g_signal_handlers_disconnect_by_func (m_focusWidget,
+ (gpointer) gtk_window_focus_out_callback,
+ this);
+ }
+
+ if (m_widget)
+ Show( false );
+
#ifdef HAVE_XIM
if (m_ic)
gdk_ic_destroy (m_ic);
gdk_ic_attr_destroy (m_icattr);
#endif
+ // delete before the widgets to avoid a crash on solaris
+ delete m_imData;
+
if (m_wxwindow)
{
gtk_widget_destroy( m_wxwindow );
bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size )
{
- wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") );
+ wxCHECK_MSG( !m_needParent || parent, false, wxT("Need complete parent.") );
// Use either the given size, or the default if -1 is given.
// See wxWindowBase for these functions.
m_x = (int)pos.x;
m_y = (int)pos.y;
- return TRUE;
+ return true;
}
void wxWindowGTK::PostCreation()
gtk_pizza_set_external( GTK_PIZZA(m_wxwindow), TRUE );
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
- GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
-
-#ifndef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
- GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this );
+ g_signal_connect (m_wxwindow, "expose_event",
+ G_CALLBACK (gtk_window_expose_callback), this);
- if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))
- {
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "event",
- GTK_SIGNAL_FUNC(gtk_window_event_event_callback), (gpointer)this );
- }
-#else
// gtk_widget_set_redraw_on_allocate( GTK_WIDGET(m_wxwindow), !HasFlag( wxFULL_REPAINT_ON_RESIZE ) );
-#endif
+ }
-#ifdef __WXGTK20__
// Create input method handler
- m_imContext = (GtkIMMulticontext*) gtk_im_multicontext_new ();
+ m_imData = new wxGtkIMData;
// Cannot handle drawing preedited text yet
- gtk_im_context_set_use_preedit( (GtkIMContext*) m_imContext, FALSE );
+ gtk_im_context_set_use_preedit( m_imData->context, FALSE );
- g_signal_connect (G_OBJECT (m_imContext), "commit",
- G_CALLBACK (gtk_wxwindow_commit_cb), this);
-#endif
- }
+ g_signal_connect (m_imData->context, "commit",
+ G_CALLBACK (gtk_wxwindow_commit_cb), this);
// these are called when the "sunken" or "raised" borders are drawn
- gtk_signal_connect( GTK_OBJECT(m_widget), "expose_event",
- GTK_SIGNAL_FUNC(gtk_window_own_expose_callback), (gpointer)this );
-
-#ifndef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(m_widget), "draw",
- GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this );
-#endif
+ g_signal_connect (m_widget, "expose_event",
+ G_CALLBACK (gtk_window_own_expose_callback), this);
}
// focus handling
- if (m_focusWidget == NULL)
- m_focusWidget = m_widget;
-
- gtk_signal_connect( GTK_OBJECT(m_focusWidget), "focus_in_event",
- GTK_SIGNAL_FUNC(gtk_window_focus_in_callback), (gpointer)this );
+ if (!GTK_IS_WINDOW(m_widget))
+ {
+ if (m_focusWidget == NULL)
+ m_focusWidget = m_widget;
- gtk_signal_connect( GTK_OBJECT(m_focusWidget), "focus_out_event",
- GTK_SIGNAL_FUNC(gtk_window_focus_out_callback), (gpointer)this );
+ g_signal_connect (m_focusWidget, "focus_in_event",
+ G_CALLBACK (gtk_window_focus_in_callback), this);
+ g_signal_connect_after (m_focusWidget, "focus_out_event",
+ G_CALLBACK (gtk_window_focus_out_callback), this);
+ }
// connect to the various key and mouse handlers
/* We cannot set colours, fonts and cursors before the widget has
been realized, so we do this directly after realization */
- gtk_signal_connect( GTK_OBJECT(connect_widget), "realize",
- GTK_SIGNAL_FUNC(gtk_window_realized_callback), (gpointer) this );
+ g_signal_connect (connect_widget, "realize",
+ G_CALLBACK (gtk_window_realized_callback), this);
if (m_wxwindow)
{
// Catch native resize events
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_window_size_callback), (gpointer)this );
+ g_signal_connect (m_wxwindow, "size_allocate",
+ G_CALLBACK (gtk_window_size_callback), this);
// Initialize XIM support
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
- GTK_SIGNAL_FUNC(gtk_wxwindow_realized_callback), (gpointer) this );
+ g_signal_connect (m_wxwindow, "realize",
+ G_CALLBACK (gtk_wxwindow_realized_callback), this);
// And resize XIM window
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_wxwindow_size_callback), (gpointer)this );
+ g_signal_connect (m_wxwindow, "size_allocate",
+ G_CALLBACK (gtk_wxwindow_size_callback), this);
}
- if ( !GTK_IS_COMBO(m_widget))
+ if (GTK_IS_COMBO(m_widget))
+ {
+ GtkCombo *gcombo = GTK_COMBO(m_widget);
+
+ g_signal_connect (gcombo->entry, "size_request",
+ G_CALLBACK (wxgtk_combo_size_request_callback),
+ this);
+ }
+ else
{
// This is needed if we want to add our windows into native
- // GTK control, such as the toolbar. With this callback, the
+ // GTK controls, such as the toolbar. With this callback, the
// toolbar gets to know the correct size (the one set by the
- // programmer). Sadly, it misbehaves for wxComboBox. FIXME
- // when moving to GTK 2.0.
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_request",
- GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback),
- (gpointer) this );
+ // programmer). Sadly, it misbehaves for wxComboBox.
+ g_signal_connect (m_widget, "size_request",
+ G_CALLBACK (wxgtk_window_size_request_callback),
+ this);
}
- m_hasVMT = TRUE;
+ InheritAttributes();
+
+ m_hasVMT = true;
// unless the window was created initially hidden (i.e. Hide() had been
// called before Create()), we should show it at GTK+ level as well
void wxWindowGTK::ConnectWidget( GtkWidget *widget )
{
- gtk_signal_connect( GTK_OBJECT(widget), "key_press_event",
- GTK_SIGNAL_FUNC(gtk_window_key_press_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(widget), "key_release_event",
- GTK_SIGNAL_FUNC(gtk_window_key_release_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(widget), "button_press_event",
- GTK_SIGNAL_FUNC(gtk_window_button_press_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(widget), "button_release_event",
- GTK_SIGNAL_FUNC(gtk_window_button_release_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(widget), "motion_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_motion_notify_callback), (gpointer)this );
-
-#ifdef __WXGTK20__
- gtk_signal_connect( GTK_OBJECT(widget), "scroll_event",
- GTK_SIGNAL_FUNC(gtk_window_wheel_callback), (gpointer)this );
-#endif
-
- gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(widget), "leave_notify_event",
- GTK_SIGNAL_FUNC(gtk_window_leave_callback), (gpointer)this );
+ g_signal_connect (widget, "key_press_event",
+ G_CALLBACK (gtk_window_key_press_callback), this);
+ g_signal_connect (widget, "key_release_event",
+ G_CALLBACK (gtk_window_key_release_callback), this);
+ g_signal_connect (widget, "button_press_event",
+ G_CALLBACK (gtk_window_button_press_callback), this);
+ g_signal_connect (widget, "button_release_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 (gtk_window_wheel_callback), this);
+ g_signal_connect (widget, "popup_menu",
+ G_CALLBACK (wxgtk_window_popup_menu_callback), this);
+ g_signal_connect (widget, "enter_notify_event",
+ G_CALLBACK (gtk_window_enter_callback), this);
+ g_signal_connect (widget, "leave_notify_event",
+ G_CALLBACK (gtk_window_leave_callback), this);
}
bool wxWindowGTK::Destroy()
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") );
- m_hasVMT = FALSE;
+ m_hasVMT = false;
return wxWindowBase::Destroy();
}
*/
if (m_resizing) return; /* I don't like recursions */
- m_resizing = TRUE;
+ m_resizing = true;
int currentX, currentY;
GetPosition(¤tX, ¤tY);
if ((maxWidth != -1) && (m_width > maxWidth)) m_width = maxWidth;
if ((maxHeight != -1) && (m_height > maxHeight)) m_height = maxHeight;
- int border = 0;
+ int left_border = 0;
+ int right_border = 0;
+ int top_border = 0;
int bottom_border = 0;
-#ifndef __WXGTK20__
+ /* the default button has a border around it */
if (GTK_WIDGET_CAN_DEFAULT(m_widget))
{
- /* the default button has a border around it */
- border = 6;
- bottom_border = 5;
+ GtkBorder *default_border = NULL;
+ gtk_widget_style_get( m_widget, "default_border", &default_border, NULL );
+ if (default_border)
+ {
+ left_border += default_border->left;
+ right_border += default_border->right;
+ top_border += default_border->top;
+ bottom_border += default_border->bottom;
+ g_free( default_border );
+ }
}
-#endif
- DoMoveWindow( m_x-border,
- m_y-border,
- m_width+2*border,
- m_height+border+bottom_border );
+ DoMoveWindow( m_x-top_border,
+ m_y-left_border,
+ m_width+left_border+right_border,
+ m_height+top_border+bottom_border );
}
if (m_hasScrolling)
GetEventHandler()->ProcessEvent( event );
}
- m_resizing = FALSE;
+ m_resizing = false;
}
void wxWindowGTK::OnInternalIdle()
{
- // Update invalidated regions.
- GtkUpdate();
-
- // Synthetize activate events.
- if ( g_sendActivateEvent != -1 )
+ if ( m_dirtyTabOrder )
{
- bool activate = g_sendActivateEvent != 0;
-
- // do it only once
- g_sendActivateEvent = -1;
-
- wxTheApp->SetActive(activate, (wxWindow *)g_focusWindowLast);
+ m_dirtyTabOrder = false;
+ RealizeTabOrder();
}
- if ( g_activeFrameLostFocus )
+ // Update style if the window was not yet realized
+ // and SetBackgroundStyle(wxBG_STYLE_CUSTOM) was called
+ if (m_needsStyleChange)
{
- if ( g_activeFrame )
- {
- wxLogTrace(wxT("activate"), wxT("Deactivating frame %p (from idle)"), g_activeFrame);
- wxActivateEvent event(wxEVT_ACTIVATE, FALSE, g_activeFrame->GetId());
- event.SetEventObject(g_activeFrame);
- g_activeFrame->GetEventHandler()->ProcessEvent(event);
- g_activeFrame = NULL;
- }
- g_activeFrameLostFocus = FALSE;
+ SetBackgroundStyle(GetBackgroundStyle());
+ m_needsStyleChange = false;
}
+ // Update invalidated regions.
+ GtkUpdate();
+
wxCursor cursor = m_cursor;
if (g_globalCursor.Ok()) cursor = g_globalCursor;
bool wxWindowGTK::Show( bool show )
{
- wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+ wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
if (!wxWindowBase::Show(show))
{
// nothing to do
- return FALSE;
+ return false;
}
if (show)
gtk_widget_hide( m_widget );
wxShowEvent eventShow(GetId(), show);
- eventShow.m_eventObject = this;
+ eventShow.SetEventObject(this);
GetEventHandler()->ProcessEvent(eventShow);
- return TRUE;
+ return true;
}
static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable)
bool wxWindowGTK::Enable( bool enable )
{
- wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+ wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
if (!wxWindowBase::Enable(enable))
{
// nothing to do
- return FALSE;
+ return false;
}
gtk_widget_set_sensitive( m_widget, enable );
wxWindowNotifyEnable(this, enable);
- return TRUE;
+ return true;
}
int wxWindowGTK::GetCharHeight() const
wxFont font = GetFont();
wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") );
-#ifdef __WXGTK20__
PangoContext *context = NULL;
if (m_widget)
context = gtk_widget_get_pango_context( m_widget );
g_object_unref( G_OBJECT( layout ) );
- return (int) (rect.height / PANGO_SCALE);
-#else
- GdkFont *gfont = font.GetInternalFont( 1.0 );
-
- return gfont->ascent + gfont->descent;
-#endif
+ return (int) PANGO_PIXELS(rect.height);
}
int wxWindowGTK::GetCharWidth() const
wxFont font = GetFont();
wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") );
-#ifdef __WXGTK20__
PangoContext *context = NULL;
if (m_widget)
context = gtk_widget_get_pango_context( m_widget );
g_object_unref( G_OBJECT( layout ) );
- return (int) (rect.width / PANGO_SCALE);
-#else
- GdkFont *gfont = font.GetInternalFont( 1.0 );
-
- return gdk_string_width( gfont, "g" );
-#endif
+ return (int) PANGO_PIXELS(rect.width);
}
void wxWindowGTK::GetTextExtent( const wxString& string,
- int *x,
- int *y,
- int *descent,
- int *externalLeading,
- const wxFont *theFont ) const
+ int *x,
+ int *y,
+ int *descent,
+ int *externalLeading,
+ const wxFont *theFont ) const
{
wxFont fontToUse = theFont ? *theFont : GetFont();
wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") );
- if (string.IsEmpty())
+ if (string.empty())
{
if (x) (*x) = 0;
if (y) (*y) = 0;
return;
}
-#ifdef __WXGTK20__
PangoContext *context = NULL;
if (m_widget)
context = gtk_widget_get_pango_context( m_widget );
pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data ));
#endif
}
- PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data;
PangoRectangle rect;
- pango_layout_line_get_extents(line, NULL, &rect);
+ pango_layout_get_extents(layout, NULL, &rect);
- if (x) (*x) = (wxCoord) (rect.width / PANGO_SCALE);
- if (y) (*y) = (wxCoord) (rect.height / PANGO_SCALE);
+ if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width);
+ if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height);
if (descent)
{
- // Do something about metrics here
- (*descent) = 0;
+ PangoLayoutIter *iter = pango_layout_get_iter(layout);
+ int baseline = pango_layout_iter_get_baseline(iter);
+ pango_layout_iter_free(iter);
+ *descent = *y - PANGO_PIXELS(baseline);
}
if (externalLeading) (*externalLeading) = 0; // ??
g_object_unref( G_OBJECT( layout ) );
-#else
- GdkFont *font = fontToUse.GetInternalFont( 1.0 );
- if (x) (*x) = gdk_string_width( font, wxGTK_CONV( string ) );
- if (y) (*y) = font->ascent + font->descent;
- if (descent) (*descent) = font->descent;
- if (externalLeading) (*externalLeading) = 0; // ??
-#endif
}
void wxWindowGTK::SetFocus()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
if ( m_hasFocus )
{
// don't do anything if we already have focus
}
else if (m_widget)
{
+ if (GTK_IS_CONTAINER(m_widget))
+ {
+ gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD );
+ }
+ else
if (GTK_WIDGET_CAN_FOCUS(m_widget) && !GTK_WIDGET_HAS_FOCUS (m_widget) )
{
+
if (!GTK_WIDGET_REALIZED(m_widget))
{
// we can't set the focus to the widget now so we remember that
gtk_widget_grab_focus (m_widget);
}
}
- else if (GTK_IS_CONTAINER(m_widget))
- {
- SET_CONTAINER_FOCUS( m_widget, GTK_DIR_TAB_FORWARD );
- }
else
{
wxLogTrace(TRACE_FOCUS,
bool wxWindowGTK::Reparent( wxWindowBase *newParentBase )
{
- wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+ wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
wxWindowGTK *oldParent = m_parent,
*newParent = (wxWindowGTK *)newParentBase;
wxASSERT( GTK_IS_WIDGET(m_widget) );
if ( !wxWindowBase::Reparent(newParent) )
- return FALSE;
+ return false;
wxASSERT( GTK_IS_WIDGET(m_widget) );
/* reverse: prevent GTK from deleting the widget arbitrarily */
gtk_widget_unref( m_widget );
- return TRUE;
+ return true;
}
void wxWindowGTK::DoAddChild(wxWindowGTK *child)
(*m_insertCallback)(this, child);
}
+void wxWindowGTK::AddChild(wxWindowBase *child)
+{
+ wxWindowBase::AddChild(child);
+ m_dirtyTabOrder = true;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+}
+
+void wxWindowGTK::RemoveChild(wxWindowBase *child)
+{
+ wxWindowBase::RemoveChild(child);
+ m_dirtyTabOrder = true;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+}
+
+void wxWindowGTK::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+{
+ wxWindowBase::DoMoveInTabOrder(win, move);
+ m_dirtyTabOrder = true;
+ if (g_isIdle)
+ wxapp_install_idle_handler();
+}
+
+void wxWindowGTK::RealizeTabOrder()
+{
+ if (m_wxwindow)
+ {
+ if ( !m_children.empty() )
+ {
+#if wxUSE_STATTEXT
+ // we don't only construct the correct focus chain but also use
+ // this opportunity to update the mnemonic widgets for all labels
+ //
+ // it would be nice to extract this code from here and put it in
+ // stattext.cpp to reduce dependencies but there is no really easy
+ // way to do it unfortunately
+ wxStaticText *lastLabel = NULL;
+#endif // wxUSE_STATTEXT
+
+ GList *chain = NULL;
+
+ for ( wxWindowList::const_iterator i = m_children.begin();
+ i != m_children.end();
+ ++i )
+ {
+ wxWindowGTK *win = *i;
+#if wxUSE_STATTEXT
+ if ( lastLabel )
+ {
+ if ( win->AcceptsFocusFromKeyboard() )
+ {
+ GtkLabel *l = GTK_LABEL(lastLabel->m_widget);
+ gtk_label_set_mnemonic_widget(l, win->m_widget);
+ lastLabel = NULL;
+ }
+ }
+ else // check if this one is a label
+ {
+ lastLabel = wxDynamicCast(win, wxStaticText);
+ }
+#endif // wxUSE_STATTEXT
+
+ chain = g_list_prepend(chain, win->m_widget);
+ }
+
+ chain = g_list_reverse(chain);
+
+ gtk_container_set_focus_chain(GTK_CONTAINER(m_wxwindow), chain);
+ g_list_free(chain);
+ }
+ else // no children
+ {
+ gtk_container_unset_focus_chain(GTK_CONTAINER(m_wxwindow));
+ }
+ }
+}
+
void wxWindowGTK::Raise()
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (!m_widget->window) return;
-
- gdk_window_raise( m_widget->window );
+ if (m_wxwindow && m_wxwindow->window)
+ {
+ gdk_window_raise( m_wxwindow->window );
+ }
+ else if (m_widget->window)
+ {
+ gdk_window_raise( m_widget->window );
+ }
}
void wxWindowGTK::Lower()
{
wxCHECK_RET( (m_widget != NULL), wxT("invalid window") );
- if (!m_widget->window) return;
-
- gdk_window_lower( m_widget->window );
+ if (m_wxwindow && m_wxwindow->window)
+ {
+ gdk_window_lower( m_wxwindow->window );
+ }
+ else if (m_widget->window)
+ {
+ gdk_window_lower( m_widget->window );
+ }
}
bool wxWindowGTK::SetCursor( const wxCursor &cursor )
{
- wxCHECK_MSG( (m_widget != NULL), FALSE, wxT("invalid window") );
+ wxCHECK_MSG( (m_widget != NULL), false, wxT("invalid window") );
if (cursor == m_cursor)
- return FALSE;
+ return false;
if (g_isIdle)
wxapp_install_idle_handler();
void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect )
{
- if (!m_widget) return;
- if (!m_widget->window) return;
-
-#ifndef __WXGTK20__
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- wxRect myRect(0,0,0,0);
- if (m_wxwindow && rect)
- {
- myRect.SetSize(wxSize( m_wxwindow->allocation.width,
- m_wxwindow->allocation.height));
- myRect.Intersect(*rect);
- if (!myRect.width || !myRect.height)
- // nothing to do, rectangle is empty
- return;
- rect = &myRect;
- }
-
- if (eraseBackground && m_wxwindow && m_wxwindow->window)
- {
- if (rect)
- {
- // Schedule for later Updating in ::Update() or ::OnInternalIdle().
- m_clearRegion.Union( rect->x, rect->y, rect->width, rect->height );
- }
- else
- {
- // Schedule for later Updating in ::Update() or ::OnInternalIdle().
- m_clearRegion.Clear();
- m_clearRegion.Union( 0, 0, m_wxwindow->allocation.width, m_wxwindow->allocation.height );
- }
- }
+ if (!m_widget)
+ return;
+ if (!m_widget->window)
+ return;
- if (rect)
- {
- if (m_wxwindow)
- {
- // Schedule for later Updating in ::Update() or ::OnInternalIdle().
- m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height );
- }
- else
- {
- GdkRectangle gdk_rect;
- gdk_rect.x = rect->x;
- gdk_rect.y = rect->y;
- gdk_rect.width = rect->width;
- gdk_rect.height = rect->height;
- gtk_widget_draw( m_widget, &gdk_rect );
- }
- }
- else
- {
- if (m_wxwindow)
- {
- // Schedule for later Updating in ::Update() or ::OnInternalIdle().
- m_updateRegion.Clear();
- m_updateRegion.Union( 0, 0, m_wxwindow->allocation.width, m_wxwindow->allocation.height );
- }
- else
- {
- gtk_widget_draw( m_widget, (GdkRectangle*) NULL );
- }
- }
-#else
if (m_wxwindow)
{
+ GdkRectangle gdk_rect,
+ *p;
if (rect)
{
- GdkRectangle gdk_rect;
gdk_rect.x = rect->x;
gdk_rect.y = rect->y;
gdk_rect.width = rect->width;
gdk_rect.height = rect->height;
- gdk_window_invalidate_rect( GTK_PIZZA(m_wxwindow)->bin_window, &gdk_rect, TRUE );
+ p = &gdk_rect;
}
- else
+ else // invalidate everything
{
- gdk_window_invalidate_rect( GTK_PIZZA(m_wxwindow)->bin_window, NULL, TRUE );
+ p = NULL;
}
+
+ gdk_window_invalidate_rect( GTK_PIZZA(m_wxwindow)->bin_window, p, TRUE );
}
-#endif
}
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();
}
void wxWindowGTK::GtkUpdate()
{
-#ifdef __WXGTK20__
if (m_wxwindow && GTK_PIZZA(m_wxwindow)->bin_window)
gdk_window_process_updates( GTK_PIZZA(m_wxwindow)->bin_window, FALSE );
-#else
- if (!m_updateRegion.IsEmpty())
- GtkSendPaintEvents();
-#endif
+
+ // 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();
+ }
}
void wxWindowGTK::GtkSendPaintEvents()
{
if (!m_wxwindow)
{
-#ifndef __WXGTK20__
- m_clearRegion.Clear();
-#endif
m_updateRegion.Clear();
return;
}
// Clip to paint region in wxClientDC
- m_clipPaintRegion = TRUE;
+ m_clipPaintRegion = true;
// widget to draw on
GtkPizza *pizza = GTK_PIZZA (m_wxwindow);
- if (GetThemeEnabled())
+ if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM))
{
// find ancestor from which to steal background
- wxWindow *parent = GetParent();
- while (parent && !parent->IsTopLevel())
- parent = parent->GetParent();
+ wxWindow *parent = wxGetTopLevelParent((wxWindow *)this);
if (!parent)
parent = (wxWindow*)this;
- wxRegionIterator upd( m_updateRegion );
- while (upd)
+ if (GTK_WIDGET_MAPPED(parent->m_widget))
{
- 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,
- pizza->bin_window,
- (GtkStateType)GTK_WIDGET_STATE(m_wxwindow),
- GTK_SHADOW_NONE,
- &rect,
- parent->m_widget,
- (char *)"base",
- 0, 0, -1, -1 );
-
- upd ++;
+ wxRegionIterator upd( m_updateRegion );
+ while (upd)
+ {
+ 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,
+ pizza->bin_window,
+ (GtkStateType)GTK_WIDGET_STATE(m_wxwindow),
+ GTK_SHADOW_NONE,
+ &rect,
+ parent->m_widget,
+ (char *)"base",
+ 0, 0, -1, -1 );
+
+ ++upd;
+ }
}
}
else
-#ifdef __WXGTK20__
{
wxWindowDC dc( (wxWindow*)this );
dc.SetClippingRegion( m_updateRegion );
GetEventHandler()->ProcessEvent(erase_event);
}
-#else
- // if (!m_clearRegion.IsEmpty()) // Always send an erase event under GTK 1.2
- {
- wxWindowDC dc( (wxWindow*)this );
- if (m_clearRegion.IsEmpty())
- dc.SetClippingRegion( m_updateRegion );
- else
- dc.SetClippingRegion( m_clearRegion );
-
- wxEraseEvent erase_event( GetId(), &dc );
- erase_event.SetEventObject( this );
-
- if (!GetEventHandler()->ProcessEvent(erase_event))
- {
- if (!g_eraseGC)
- {
- g_eraseGC = gdk_gc_new( pizza->bin_window );
- gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
- }
- gdk_gc_set_foreground( g_eraseGC, GetBackgroundColour().GetColor() );
-
- wxRegionIterator upd( m_clearRegion );
- while (upd)
- {
- gdk_draw_rectangle( pizza->bin_window, g_eraseGC, 1,
- upd.GetX(), upd.GetY(), upd.GetWidth(), upd.GetHeight() );
- upd ++;
- }
- }
- m_clearRegion.Clear();
- }
-#endif
wxNcPaintEvent nc_paint_event( GetId() );
nc_paint_event.SetEventObject( this );
paint_event.SetEventObject( this );
GetEventHandler()->ProcessEvent( paint_event );
- m_clipPaintRegion = FALSE;
-
-#ifndef __WXUNIVERSAL__
-#ifndef __WXGTK20__
- // The following code will result in all window-less widgets
- // being redrawn because the wxWidgets class is allowed to
- // paint over the window-less widgets.
-
- GList *children = pizza->children;
- while (children)
- {
- GtkPizzaChild *child = (GtkPizzaChild*) children->data;
- children = children->next;
-
- if (GTK_WIDGET_NO_WINDOW (child->widget) &&
- GTK_WIDGET_DRAWABLE (child->widget))
- {
- // Get intersection of widget area and update region
- wxRegion region( m_updateRegion );
-
- GdkEventExpose gdk_event;
- gdk_event.type = GDK_EXPOSE;
- gdk_event.window = pizza->bin_window;
- gdk_event.count = 0;
-
- wxRegionIterator upd( m_updateRegion );
- while (upd)
- {
- GdkRectangle rect;
- rect.x = upd.GetX();
- rect.y = upd.GetY();
- rect.width = upd.GetWidth();
- rect.height = upd.GetHeight();
-
- if (gtk_widget_intersect (child->widget, &rect, &gdk_event.area))
- {
- gtk_widget_event (child->widget, (GdkEvent*) &gdk_event);
- }
-
- upd ++;
- }
- }
- }
-#endif
-#endif
+ m_clipPaintRegion = false;
m_updateRegion.Clear();
}
void wxWindowGTK::ClearBackground()
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
-#ifndef __WXGTK20__
- if (m_wxwindow && m_wxwindow->window)
- {
- m_clearRegion.Clear();
- wxSize size( GetClientSize() );
- m_clearRegion.Union( 0,0,size.x,size.y );
-
- // Better do this in idle?
- GtkUpdate();
- }
-#endif
}
#if wxUSE_TOOLTIPS
bool wxWindowGTK::SetBackgroundColour( const wxColour &colour )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
if (!wxWindowBase::SetBackgroundColour(colour))
return false;
}
// apply style change (forceStyle=true so that new style is applied
- // even if the bg colour changed from valid to wxNullColour):
- ApplyWidgetStyle(true);
+ // even if the bg colour changed from valid to wxNullColour)
+ if (GetBackgroundStyle() != wxBG_STYLE_CUSTOM)
+ ApplyWidgetStyle(true);
return true;
}
bool wxWindowGTK::SetForegroundColour( const wxColour &colour )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
if (!wxWindowBase::SetForegroundColour(colour))
{
return false;
}
-
+
if (colour.Ok())
{
// We need the pixel value e.g. for background clearing.
return true;
}
-#ifdef __WXGTK20__
PangoContext *wxWindowGTK::GtkGetPangoDefaultContext()
{
return gtk_widget_get_pango_context( m_widget );
}
-PangoContext *wxWindowGTK::GtkGetPangoX11Context()
-{
- if (!m_x11Context)
- m_x11Context = pango_x_get_context( gdk_display );
-
- return m_x11Context;
-}
-#endif
-
GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
{
// do we need to apply any changes at all?
if ( !forceStyle &&
- !m_hasFont && !m_hasFgCol &&
- (!m_hasBgCol || !m_backgroundColour.Ok()) )
+ !m_font.Ok() &&
+ !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
{
return NULL;
}
GtkRcStyle *style = gtk_rc_style_new();
- if ( m_hasFont )
+ if ( m_font.Ok() )
{
-#ifdef __WXGTK20__
- style->font_desc =
+ style->font_desc =
pango_font_description_copy( m_font.GetNativeFontInfo()->description );
-#else
- wxString xfontname = m_font.GetNativeFontInfo()->GetXFontName();
- style->fontset_name = g_strdup(xfontname.c_str());
-#endif
}
if ( m_foregroundColour.Ok() )
{
GdkColor *fg = m_foregroundColour.GetColor();
-
+
style->fg[GTK_STATE_NORMAL] = *fg;
style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG;
-
+
style->fg[GTK_STATE_PRELIGHT] = *fg;
style->color_flags[GTK_STATE_PRELIGHT] = GTK_RC_FG;
-
+
style->fg[GTK_STATE_ACTIVE] = *fg;
style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG;
}
style->base[GTK_STATE_NORMAL] = *bg;
style->color_flags[GTK_STATE_NORMAL] = (GtkRcFlags)
(style->color_flags[GTK_STATE_NORMAL] | GTK_RC_BG | GTK_RC_BASE);
-
+
style->bg[GTK_STATE_PRELIGHT] = *bg;
style->base[GTK_STATE_PRELIGHT] = *bg;
style->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags)
(style->color_flags[GTK_STATE_PRELIGHT] | GTK_RC_BG | GTK_RC_BASE);
-
+
style->bg[GTK_STATE_ACTIVE] = *bg;
style->base[GTK_STATE_ACTIVE] = *bg;
style->color_flags[GTK_STATE_ACTIVE] = (GtkRcFlags)
(style->color_flags[GTK_STATE_ACTIVE] | GTK_RC_BG | GTK_RC_BASE);
-
+
style->bg[GTK_STATE_INSENSITIVE] = *bg;
style->base[GTK_STATE_INSENSITIVE] = *bg;
style->color_flags[GTK_STATE_INSENSITIVE] = (GtkRcFlags)
(style->color_flags[GTK_STATE_INSENSITIVE] | GTK_RC_BG | GTK_RC_BASE);
}
-
+
return style;
}
GtkRcStyle *style = CreateWidgetStyle(forceStyle);
if ( style )
{
- if (m_wxwindow)
- // should we also do m_widget in this case?
- gtk_widget_modify_style(m_wxwindow, style);
- else
- gtk_widget_modify_style(m_widget, style);
+ DoApplyWidgetStyle(style);
gtk_rc_style_unref(style);
}
-}
-
-//-----------------------------------------------------------------------------
-// Pop-up menu stuff
-//-----------------------------------------------------------------------------
-
-#if wxUSE_MENUS_NATIVE
-
-extern "C"
-void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting )
-{
- *is_waiting = FALSE;
-}
-
-static void SetInvokingWindow( wxMenu *menu, wxWindowGTK *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();
- }
+ // Style change may affect GTK+'s size calculation:
+ InvalidateBestSize();
}
-extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
- gint *x, gint *y,
-#ifdef __WXGTK20__
- gboolean * WXUNUSED(whatever),
-#endif
- gpointer user_data )
+void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
{
- // ensure that the menu appears entirely on screen
- GtkRequisition req;
- gtk_widget_get_child_requisition(GTK_WIDGET(menu), &req);
-
- wxSize sizeScreen = wxGetDisplaySize();
- wxPoint *pos = (wxPoint*)user_data;
-
- gint xmax = sizeScreen.x - req.width,
- ymax = sizeScreen.y - req.height;
-
- *x = pos->x < xmax ? pos->x : xmax;
- *y = pos->y < ymax ? pos->y : ymax;
+ if (m_wxwindow)
+ gtk_widget_modify_style(m_wxwindow, style);
+ else
+ gtk_widget_modify_style(m_widget, style);
}
-bool wxWindowGTK::DoPopupMenu( wxMenu *menu, int x, int y )
+bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)
{
- wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
+ wxWindowBase::SetBackgroundStyle(style);
- wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") );
-
- SetInvokingWindow( menu, this );
-
- menu->UpdateUI();
-
- bool is_waiting = true;
-
- gtk_signal_connect( GTK_OBJECT(menu->m_menu),
- "hide",
- GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
- (gpointer)&is_waiting );
-
- wxPoint pos;
- gpointer userdata;
- GtkMenuPositionFunc posfunc;
- if ( x == -1 && y == -1 )
- {
- // use GTK's default positioning algorithm
- userdata = NULL;
- posfunc = NULL;
- }
- else
+ if (style == wxBG_STYLE_CUSTOM)
{
- pos = ClientToScreen(wxPoint(x, y));
- userdata = &pos;
- posfunc = wxPopupMenuPositionCallback;
- }
+ GdkWindow *window = (GdkWindow*) NULL;
+ if (m_wxwindow)
+ window = GTK_PIZZA(m_wxwindow)->bin_window;
+ else
+ window = GetConnectWidget()->window;
- gtk_menu_popup(
- GTK_MENU(menu->m_menu),
- (GtkWidget *) NULL, // parent menu shell
- (GtkWidget *) NULL, // parent menu item
- posfunc, // function to position it
- userdata, // client data
- 0, // button used to activate it
-#ifdef __WXGTK20__
- gtk_get_current_event_time()
-#else
- gs_timeLastClick // the time of activation
+ if (window)
+ {
+ // Make sure GDK/X11 doesn't refresh the window
+ // automatically.
+ gdk_window_set_back_pixmap( window, None, False );
+#ifdef __X__
+ Display* display = GDK_WINDOW_DISPLAY(window);
+ XFlush(display);
#endif
- );
+ m_needsStyleChange = false;
+ }
+ else
+ // Do in OnIdle, because the window is not yet available
+ m_needsStyleChange = true;
- while (is_waiting)
+ // Don't apply widget style, or we get a grey background
+ }
+ else
{
- gtk_main_iteration();
+ // apply style change (forceStyle=true so that new style is applied
+ // even if the bg colour changed from valid to wxNullColour):
+ ApplyWidgetStyle(true);
}
-
return true;
}
-#endif // wxUSE_MENUS_NATIVE
-
#if wxUSE_DRAG_AND_DROP
void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget )
bool wxWindowGTK::SetFont( const wxFont &font )
{
- wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") );
+ wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") );
if (!wxWindowBase::SetFont(font))
return false;
// apply style change (forceStyle=true so that new style is applied
// even if the font changed from valid to wxNullFont):
- ApplyWidgetStyle(true);
+ ApplyWidgetStyle(true);
return true;
}
cursor->GetCursor(),
(guint32)GDK_CURRENT_TIME );
g_captureWindow = this;
- g_captureWindowHasMouse = TRUE;
+ g_captureWindowHasMouse = true;
}
void wxWindowGTK::DoReleaseMouse()
bool wxWindowGTK::IsRetained() const
{
- return FALSE;
+ return false;
}
void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible,
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
- m_hasScrolling = TRUE;
+ m_hasScrolling = true;
if (orient == wxHORIZONTAL)
{
}
if (orient == wxHORIZONTAL)
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "changed" );
+ g_signal_emit_by_name (m_hAdjust, "changed");
else
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" );
+ g_signal_emit_by_name (m_vAdjust, "changed");
+}
+
+void wxWindowGTK::GtkUpdateScrollbar(int orient)
+{
+ GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust;
+ gpointer fn = orient == wxHORIZONTAL
+ ? (gpointer) gtk_window_hscroll_callback
+ : (gpointer) gtk_window_vscroll_callback;
+
+ g_signal_handlers_disconnect_by_func (adj, fn, this);
+ g_signal_emit_by_name (adj, "value_changed");
+ g_signal_connect (adj, "value_changed", G_CALLBACK (fn), this);
}
void wxWindowGTK::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid window") );
-
wxCHECK_RET( m_wxwindow != NULL, wxT("window needs client area for scrolling") );
- if (orient == wxHORIZONTAL)
- {
- float fpos = (float)pos;
- if (fpos > m_hAdjust->upper - m_hAdjust->page_size) fpos = m_hAdjust->upper - m_hAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldHorizontalPos = fpos;
+ GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust;
- if (fabs(fpos-m_hAdjust->value) < 0.2) return;
- m_hAdjust->value = fpos;
- }
- else
- {
- float fpos = (float)pos;
- if (fpos > m_vAdjust->upper - m_vAdjust->page_size) fpos = m_vAdjust->upper - m_vAdjust->page_size;
- if (fpos < 0.0) fpos = 0.0;
- m_oldVerticalPos = fpos;
+ float fpos = (float)pos;
+ if (fpos > adj->upper - adj->page_size)
+ fpos = adj->upper - adj->page_size;
+ if (fpos < 0.0)
+ fpos = 0.0;
+ *(orient == wxHORIZONTAL ? &m_oldHorizontalPos : &m_oldVerticalPos) = fpos;
- if (fabs(fpos-m_vAdjust->value) < 0.2) return;
- m_vAdjust->value = fpos;
- }
+ if (fabs(fpos-adj->value) < 0.2)
+ return;
+ adj->value = fpos;
- if (m_wxwindow->window)
+ if ( m_wxwindow->window )
{
- if (orient == wxHORIZONTAL)
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_hAdjust),
- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
-
- gtk_signal_emit_by_name( GTK_OBJECT(m_hAdjust), "value_changed" );
-
- gtk_signal_connect( GTK_OBJECT(m_hAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_hscroll_callback, (gpointer) this );
- }
- else
- {
- gtk_signal_disconnect_by_func( GTK_OBJECT(m_vAdjust),
- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
-
- gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "value_changed" );
-
- gtk_signal_connect( GTK_OBJECT(m_vAdjust), "value_changed",
- (GtkSignalFunc) gtk_window_vscroll_callback, (gpointer) this );
- }
}
}
// No scrolling requested.
if ((dx == 0) && (dy == 0)) return;
-#ifndef __WXGTK20__
- if (!m_updateRegion.IsEmpty())
- {
- m_updateRegion.Offset( dx, dy );
-
- int cw = 0;
- int ch = 0;
- GetClientSize( &cw, &ch );
- m_updateRegion.Intersect( 0, 0, cw, ch );
- }
-
- if (!m_clearRegion.IsEmpty())
- {
- m_clearRegion.Offset( dx, dy );
-
- int cw = 0;
- int ch = 0;
- GetClientSize( &cw, &ch );
- m_clearRegion.Intersect( 0, 0, cw, ch );
- }
-#endif
-
- m_clipPaintRegion = TRUE;
+ m_clipPaintRegion = true;
gtk_pizza_scroll( GTK_PIZZA(m_wxwindow), -dx, -dy );
- m_clipPaintRegion = FALSE;
+ m_clipPaintRegion = false;
}
+void wxWindowGTK::SetWindowStyleFlag( long style )
+{
+ // Updates the internal variable. NB: Now m_windowStyle bits carry the _new_ style values already
+ wxWindowBase::SetWindowStyleFlag(style);
+}
// Find the wxWindow at the current mouse position, also returning the mouse
// position.
}
+// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
+void wxAddGrab(wxWindow* window)
+{
+ gtk_grab_add( (GtkWidget*) window->GetHandle() );
+}
+
+void wxRemoveGrab(wxWindow* window)
+{
+ gtk_grab_remove( (GtkWidget*) window->GetHandle() );
+}
+
// ----------------------------------------------------------------------------
-// wxDCModule
+// wxWinModule
// ----------------------------------------------------------------------------
class wxWinModule : public wxModule
// g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() );
// gdk_gc_set_fill( g_eraseGC, GDK_SOLID );
- return TRUE;
+ return true;
}
void wxWinModule::OnExit()
gdk_gc_unref( g_eraseGC );
}
-// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff