X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aac97549ab6be4d2a4bf49a1a7c781d648304eff..9419b0d64948485ab83122484ffe4b7dcde25905:/src/gtk1/window.cpp diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index a55d32a3ad..f7dd7acaeb 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -7,11 +7,6 @@ // 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" @@ -60,7 +55,7 @@ #include "wx/math.h" #include -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include #include #include @@ -68,22 +63,7 @@ #include #include -#include "wx/gtk/win_gtk.h" - -#ifdef __WXGTK20__ -#include -#endif - - -#ifdef __WXGTK20__ - #ifdef HAVE_XIM - #undef HAVE_XIM - #endif -#endif - -#ifdef __WXGTK20__ -extern GtkContainerClass *pizza_parent_class; -#endif +#include "wx/gtk1/win_gtk.h" //----------------------------------------------------------------------------- // documentation on internals @@ -138,7 +118,7 @@ extern GtkContainerClass *pizza_parent_class; 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 @@ -178,27 +158,27 @@ extern GtkContainerClass *pizza_parent_class; 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) @@ -210,7 +190,7 @@ extern GtkContainerClass *pizza_parent_class; 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. */ @@ -229,7 +209,7 @@ static GdkGC *g_eraseGC = NULL; // 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; wxWindowGTK *g_focusWindow = (wxWindowGTK*) NULL; @@ -243,8 +223,8 @@ wxWindowGTK *g_focusWindowLast = (wxWindowGTK*) NULL; wxWindowGTK *g_delayedFocus = (wxWindowGTK*) NULL; // 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; +// the last click here (extern: used from gtk/menu.cpp) +guint32 wxGtkTimeLastClick = 0; extern bool g_mainThreadLocked; @@ -275,23 +255,11 @@ gdk_window_warp_pointer (GdkWindow *window, 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), - None, /* not source window -> move from anywhere */ - GDK_WINDOW_XID(window), /* dest window */ - 0, 0, 0, 0, /* not source window -> move from anywhere */ - x, y ); - } -#else priv = (GdkWindowPrivate*) window; if (!priv->destroyed) @@ -302,7 +270,6 @@ gdk_window_warp_pointer (GdkWindow *window, 0, 0, 0, 0, /* not source window -> move from anywhere */ x, y ); } -#endif } //----------------------------------------------------------------------------- @@ -379,7 +346,7 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) dh += hscroll_req.height; dh += scroll_class->scrollbar_spacing; } -} + } int dx = 0; int dy = 0; @@ -429,39 +396,34 @@ static void draw_frame( GtkWidget *widget, wxWindowGTK *win ) // "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__ - +extern "C" { 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) @@ -476,16 +438,17 @@ void wxgtk_window_size_request_callback(GtkWidget *widget, requisition->height = h; requisition->width = w; } +} - -extern "C" +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) @@ -494,21 +457,23 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget, 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+4; // TODO: why +4? + 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 ) @@ -518,47 +483,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, 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. - - GtkPizza *pizza = GTK_PIZZA( widget ); - if (gdk_event->window != pizza->bin_window) return FALSE; - -#if 0 - if (win->GetName()) - { - wxPrintf( wxT("OnExpose from ") ); - if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - wxPrintf( win->GetClassInfo()->GetClassName() ); - wxPrintf( wxT(" %d %d %d %d\n"), (int)gdk_event->area.x, - (int)gdk_event->area.y, - (int)gdk_event->area.width, - (int)gdk_event->area.height ); - } - - gtk_paint_box - ( - win->m_wxwindow->style, - pizza->bin_window, - GTK_STATE_NORMAL, - GTK_SHADOW_OUT, - (GdkRectangle*) NULL, - win->m_wxwindow, - (char *)"button", // const_cast - 20,20,24,24 - ); -#endif - - win->GetUpdateRegion() = wxRegion( gdk_event->region ); - - win->GtkSendPaintEvents(); - - - // 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. @@ -574,10 +498,10 @@ static int gtk_window_expose_callback( GtkWidget *widget, // Actual redrawing takes place in idle time. // win->GtkUpdate(); -#endif return FALSE; } +} //----------------------------------------------------------------------------- // "event" of m_wxwindow @@ -589,6 +513,8 @@ static int gtk_window_expose_callback( GtkWidget *widget, // There, we look for expose events ourselves whereas all other events are // handled normally. +extern "C" { +static gint gtk_window_event_event_callback( GtkWidget *widget, GdkEventExpose *event, wxWindow *win ) @@ -601,16 +527,16 @@ gint gtk_window_event_event_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "draw" of m_wxwindow //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ - // This callback is a complete replacement of the gtk_pizza_draw() function, // which is disabled. +extern "C" { static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) @@ -686,8 +612,7 @@ static void gtk_window_draw_callback( GtkWidget *widget, } #endif } - -#endif +} //----------------------------------------------------------------------------- // "key_press_event" from any window @@ -1000,6 +925,8 @@ static void wxFillOtherKeyEventFields(wxKeyEvent& event, #if wxUSE_UNICODE event.m_uniChar = gdk_keyval_to_unicode(gdk_event->keyval); #endif + wxGetMousePosition( &x, &y ); + win->ScreenToClient( &x, &y ); event.m_x = x; event.m_y = y; event.SetEventObject( win ); @@ -1029,7 +956,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, : _T("press"), keysym); - long key_code = wxTranslateKeySymToWXKey(keysym, FALSE /* !isChar */); + long key_code = wxTranslateKeySymToWXKey(keysym, false /* !isChar */); if ( !key_code ) { @@ -1045,7 +972,7 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, } // 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 '%'). @@ -1098,35 +1025,18 @@ wxTranslateGTKKeyEventToWx(wxKeyEvent& event, // sending unknown key events doesn't really make sense if ( !key_code ) - return FALSE; + return false; // now fill all the other fields wxFillOtherKeyEventFields(event, win, gdk_event); - + event.m_keyCode = key_code; - return TRUE; + return true; } -#ifdef __WXGTK20__ -struct wxGtkIMData -{ - GtkIMContext *context; - GdkEventKey *lastKeyEvent; - - wxGtkIMData() - { - context = gtk_im_multicontext_new(); - lastKeyEvent = NULL; - } - ~wxGtkIMData() - { - g_object_unref(context); - } -}; -#endif - +extern "C" { static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win ) @@ -1146,57 +1056,27 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, bool ret = false; bool return_after_IM = false; - if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) ) + if( wxTranslateGTKKeyEventToWx(event, win, gdk_event) == false ) { // Emit KEY_DOWN event ret = win->GetEventHandler()->ProcessEvent( event ); } - else + else { // Return after IM processing as we cannot do // anything with it anyhow. return_after_IM = true; } -#ifdef __WXGTK20__ - // 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; - } - } -#endif - if (return_after_IM) - return true; - -#ifndef __WXGTK20__ // This is for GTK+ 1.2 only. The char event generatation for GTK+ 2.0 is done // in the "commit" handler. - + // 2005.02.02 modified by Hong Jen Yee (hzysoft@sina.com.tw). - // In GTK+ 1.2, strings sent by IMs are also regarded as key_press events whose - // keyCodes cannot be recognized by wxWidgets. These MBCS strings, however, are - // composed of more than one character, which means gdk_event->length will always + // In GTK+ 1.2, strings sent by IMs are also regarded as key_press events whose + // keyCodes cannot be recognized by wxWidgets. These MBCS strings, however, are + // composed of more than one character, which means gdk_event->length will always // greater than one. When gtk_event->length == 1, this may be an ASCII character - // and can be translated by wx. However, when MBCS characters are sent by IM, + // and can be translated by wx. However, when MBCS characters are sent by IM, // gdk_event->length will >= 2. So neither should we pass it to accelerator table, // nor should we pass it to controls. The following explanation was excerpted // from GDK documentation. @@ -1218,7 +1098,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, const char* string = gdk_event->string; #endif - // Implement OnCharHook by checking ancesteror top level windows + // Implement OnCharHook by checking ancestor top level windows wxWindow *parent = win; while (parent && !parent->IsTopLevel()) parent = parent->GetParent(); @@ -1245,8 +1125,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, } return true; } - -#endif // #ifndef __WXGTK20__ + + if (return_after_IM) + return false; #if wxUSE_ACCEL if (!ret) @@ -1275,7 +1156,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, long key_code; KeySym keysym = gdk_event->keyval; // Find key code for EVT_CHAR and EVT_CHAR_HOOK events - key_code = wxTranslateKeySymToWXKey(keysym, TRUE /* isChar */); + key_code = wxTranslateKeySymToWXKey(keysym, true /* isChar */); if ( !key_code ) { if ( wxIsAsciiKeysym(keysym) ) @@ -1296,7 +1177,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, event.m_keyCode = key_code; - // Implement OnCharHook by checking ancesteror top level windows + // Implement OnCharHook by checking ancestor top level windows wxWindow *parent = win; while (parent && !parent->IsTopLevel()) parent = parent->GetParent(); @@ -1321,7 +1202,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, // 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 @@ -1373,9 +1254,9 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, 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); } } @@ -1387,68 +1268,13 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, return FALSE; } - -#ifdef __WXGTK20__ -static void gtk_wxwindow_commit_cb (GtkIMContext *context, - const gchar *str, - wxWindow *window) -{ - wxKeyEvent event( wxEVT_KEY_DOWN ); - - // 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); - } - -#if wxUSE_UNICODE - const wxWCharBuffer data = wxConvUTF8.cMB2WC( (char*)str ); -#else - 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(); - - for( const wxChar* pstr = data; *pstr; 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); -#else - event.m_keyCode = *pstr; -#endif // wxUSE_UNICODE - 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 ) @@ -1467,7 +1293,7 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, 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; } @@ -1477,6 +1303,7 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_release_event" ); return TRUE; } +} // ============================================================================ // the mouse events @@ -1620,6 +1447,7 @@ wxWindowGTK *FindWindowForMouseEvent(wxWindowGTK *win, wxCoord& x, wxCoord& y) // "button_press_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindowGTK *win ) @@ -1652,7 +1480,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, */ } - // 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) @@ -1675,20 +1503,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, wxEventType event_type = wxEVT_NULL; - // GdkDisplay is a GTK+ 2.2.0 thing -#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 2, 0) - if ( gdk_event->type == GDK_2BUTTON_PRESS && - gdk_event->button >= 1 && gdk_event->button <= 3 ) - { - // Reset GDK internal timestamp variables in order to disable GDK - // triple click events. GDK will then next time believe no button has - // been clicked just before, and send a normal button click event. - GdkDisplay* display = gtk_widget_get_display (widget); - display->button_click_time[1] = 0; - display->button_click_time[0] = 0; - } -#endif // GTK 2+ - if (gdk_event->button == 1) { // note that GDK generates triple click events which are not supported @@ -1767,19 +1581,18 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, 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; + wxGtkTimeLastClick = gdk_event->time; -#ifndef __WXGTK20__ if (event_type == wxEVT_LEFT_DCLICK) { // GTK 1.2 crashes when intercepting double @@ -1791,7 +1604,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, return FALSE; } } -#endif if (win->GetEventHandler()->ProcessEvent( event )) { @@ -1818,11 +1630,13 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "button_release_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindowGTK *win ) @@ -1878,11 +1692,13 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "motion_notify_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindowGTK *win ) @@ -1932,11 +1748,11 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, // 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 @@ -1952,76 +1768,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, return FALSE; } - -#ifdef __WXGTK20__ -//----------------------------------------------------------------------------- -// "mouse_wheel_event" -//----------------------------------------------------------------------------- - -static gint gtk_window_wheel_callback (GtkWidget * widget, - GdkEventScroll * gdk_event, - wxWindowGTK * win) -{ - DEBUG_MAIN_THREAD - - if (g_isIdle) - wxapp_install_idle_handler(); - - wxEventType event_type = wxEVT_NULL; - if (gdk_event->direction == GDK_SCROLL_UP) - event_type = wxEVT_MOUSEWHEEL; - else if (gdk_event->direction == GDK_SCROLL_DOWN) - 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_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_linesPerAction = 3; - event.m_wheelDelta = 120; - if (gdk_event->direction == GDK_SCROLL_UP) - event.m_wheelRotation = 120; - else - event.m_wheelRotation = -120; - - wxPoint pt = win->GetClientAreaOrigin(); - event.m_x = (wxCoord)gdk_event->x - pt.x; - event.m_y = (wxCoord)gdk_event->y - pt.y; - - 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" ); - return TRUE; - } - - return FALSE; -} - -//----------------------------------------------------------------------------- -// "popup-menu" -//----------------------------------------------------------------------------- -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); } -#endif // __WXGTK20__ //----------------------------------------------------------------------------- // "focus_in_event" @@ -2042,20 +1789,16 @@ static bool DoSendFocusEvents(wxWindow *win) return win->GetEventHandler()->ProcessEvent(eventFocus); } +extern "C" { static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) { DEBUG_MAIN_THREAD - + if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ - if (win->m_imData) - gtk_im_context_focus_in(win->m_imData->context); -#endif - g_focusWindowLast = g_focusWindow = win; @@ -2080,8 +1823,8 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, 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" ); @@ -2091,11 +1834,13 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "focus_out_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win ) { DEBUG_MAIN_THREAD @@ -2103,11 +1848,6 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk if (g_isIdle) wxapp_install_idle_handler(); -#ifdef __WXGTK20__ - if (win->m_imData) - gtk_im_context_focus_out(win->m_imData->context); -#endif - wxLogTrace( TRACE_FOCUS, _T("%s: focus out"), win->GetName().c_str() ); @@ -2136,7 +1876,7 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk // 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 ); @@ -2150,11 +1890,13 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk return FALSE; } +} //----------------------------------------------------------------------------- // "enter_notify_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, @@ -2193,11 +1935,13 @@ gint gtk_window_enter_callback( GtkWidget *widget, return FALSE; } +} //----------------------------------------------------------------------------- // "leave_notify_event" //----------------------------------------------------------------------------- +extern "C" { static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindowGTK *win ) { DEBUG_MAIN_THREAD @@ -2243,11 +1987,13 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ return FALSE; } +} //----------------------------------------------------------------------------- // "value_changed" from m_vAdjust //----------------------------------------------------------------------------- +extern "C" { static void gtk_window_vscroll_callback( GtkAdjustment *adjust, SCROLLBAR_CBACK_ARG wxWindowGTK *win ) @@ -2266,9 +2012,7 @@ static void gtk_window_vscroll_callback( GtkAdjustment *adjust, win->m_oldVerticalPos = adjust->value; -#ifndef __WXGTK20__ GtkScrolledWindow *sw = GTK_SCROLLED_WINDOW(win->m_widget); -#endif wxEventType command = GtkScrollWinTypeToWx(GET_SCROLL_TYPE(sw->vscrollbar)); int value = (int)(adjust->value+0.5); @@ -2277,11 +2021,13 @@ static void gtk_window_vscroll_callback( GtkAdjustment *adjust, 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 ) @@ -2297,9 +2043,7 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, 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)); win->m_oldHorizontalPos = adjust->value; @@ -2310,11 +2054,13 @@ static void gtk_window_hscroll_callback( GtkAdjustment *adjust, 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) @@ -2325,20 +2071,20 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *widget, wxapp_install_idle_handler(); - g_blockEventsOnScroll = TRUE; + g_blockEventsOnScroll = true; // FIXME: there is no 'slider' field in GTK+ 2.0 any more -#ifndef __WXGTK20__ 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) @@ -2350,7 +2096,7 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget, // // if (gdk_event->window != widget->slider) return FALSE; - g_blockEventsOnScroll = FALSE; + g_blockEventsOnScroll = false; if (win->m_isScrolling) { @@ -2375,10 +2121,11 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget, win->GetEventHandler()->ProcessEvent( event ); } - win->m_isScrolling = FALSE; + win->m_isScrolling = false; return FALSE; } +} // ---------------------------------------------------------------------------- // this wxWindowBase function is implemented here (in platform-specific file) @@ -2391,7 +2138,6 @@ wxWindow *wxWindowBase::DoFindFocus() return (wxWindow *)g_focusWindow; } - //----------------------------------------------------------------------------- // "realize" from m_widget //----------------------------------------------------------------------------- @@ -2399,6 +2145,7 @@ wxWindow *wxWindowBase::DoFindFocus() /* 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 ) { @@ -2406,15 +2153,6 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); - -#ifdef __WXGTK20__ - if (win->m_imData) - { - GtkPizza *pizza = GTK_PIZZA( m_widget ); - gtk_im_context_set_client_window( win->m_imData->context, - pizza->bin_window ); - } -#endif wxWindowCreateEvent event( win ); event.SetEventObject( win ); @@ -2422,11 +2160,13 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) return FALSE; } +} //----------------------------------------------------------------------------- // "size_allocate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation *WXUNUSED(alloc), @@ -2453,6 +2193,7 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), win->GetEventHandler()->ProcessEvent( event ); } } +} #ifdef HAVE_XIM @@ -2463,6 +2204,7 @@ void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), /* Resize XIM window */ +extern "C" { static void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget), GtkAllocation* WXUNUSED_UNLESS_XIM(alloc), @@ -2486,6 +2228,7 @@ void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget), } #endif // HAVE_XIM } +} //----------------------------------------------------------------------------- // "realize" from m_wxwindow @@ -2493,6 +2236,7 @@ void gtk_wxwindow_size_callback( GtkWidget* WXUNUSED_UNLESS_XIM(widget), /* Initialize XIM support */ +extern "C" { static gint gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget), wxWindowGTK * WXUNUSED_UNLESS_XIM(win) ) @@ -2579,6 +2323,7 @@ gtk_wxwindow_realized_callback( GtkWidget * WXUNUSED_UNLESS_XIM(widget), return FALSE; } +} //----------------------------------------------------------------------------- // InsertChild for wxWindowGTK. @@ -2616,6 +2361,31 @@ wxWindow *wxGetActiveWindow() 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 //----------------------------------------------------------------------------- @@ -2641,16 +2411,16 @@ void wxWindowGTK::Init() 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; @@ -2659,29 +2429,23 @@ void wxWindowGTK::Init() 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_imData = NULL; - m_x11Context = NULL; - m_dirtyTabOrder = false; -#else #ifdef HAVE_XIM m_ic = (GdkIC*) NULL; m_icattr = (GdkICAttr*) NULL; #endif -#endif } wxWindowGTK::wxWindowGTK() @@ -2712,7 +2476,7 @@ bool wxWindowGTK::Create( wxWindow *parent, !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { wxFAIL_MSG( wxT("wxWindowGTK creation failed") ); - return FALSE; + return false; } m_insertCallback = wxInsertChildInWindow; @@ -2756,7 +2520,7 @@ bool wxWindowGTK::Create( wxWindow *parent, 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; @@ -2808,7 +2572,7 @@ bool wxWindowGTK::Create( wxWindow *parent, PostCreation(); - return TRUE; + return true; } wxWindowGTK::~wxWindowGTK() @@ -2821,14 +2585,25 @@ wxWindowGTK::~wxWindowGTK() 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) + { + gtk_signal_disconnect_by_func( GTK_OBJECT(m_focusWidget), + (GtkSignalFunc) gtk_window_focus_in_callback, (gpointer) this ); + gtk_signal_disconnect_by_func( GTK_OBJECT(m_focusWidget), + (GtkSignalFunc) gtk_window_focus_out_callback, (gpointer) this ); + } + + if (m_widget) + Show( false ); + #ifdef HAVE_XIM if (m_ic) gdk_ic_destroy (m_ic); @@ -2847,15 +2622,11 @@ wxWindowGTK::~wxWindowGTK() gtk_widget_destroy( m_widget ); m_widget = (GtkWidget*) NULL; } - -#ifdef __WXGTK20__ - delete m_imData; -#endif } 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. @@ -2865,7 +2636,7 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const w m_x = (int)pos.x; m_y = (int)pos.y; - return TRUE; + return true; } void wxWindowGTK::PostCreation() @@ -2883,7 +2654,6 @@ void wxWindowGTK::PostCreation() 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 ); @@ -2892,30 +2662,14 @@ void wxWindowGTK::PostCreation() 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_imData = new wxGtkIMData; - - // Cannot handle drawing preedited text yet - gtk_im_context_set_use_preedit( m_imData->context, FALSE ); - - g_signal_connect (G_OBJECT (m_imData->context), "commit", - G_CALLBACK (gtk_wxwindow_commit_cb), this); -#endif - // 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 } // focus handling @@ -2924,7 +2678,7 @@ void wxWindowGTK::PostCreation() { 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 ); @@ -2961,7 +2715,7 @@ void wxWindowGTK::PostCreation() if (GTK_IS_COMBO(m_widget)) { GtkCombo *gcombo = GTK_COMBO(m_widget); - + gtk_signal_connect( GTK_OBJECT(gcombo->entry), "size_request", GTK_SIGNAL_FUNC(wxgtk_combo_size_request_callback), (gpointer) this ); @@ -2979,7 +2733,7 @@ void wxWindowGTK::PostCreation() InheritAttributes(); - m_hasVMT = TRUE; + 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 @@ -3004,13 +2758,6 @@ void wxWindowGTK::ConnectWidget( GtkWidget *widget ) 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 ); - g_signal_connect(widget, "popup_menu", - G_CALLBACK(wxgtk_window_popup_menu_callback), this); -#endif - gtk_signal_connect( GTK_OBJECT(widget), "enter_notify_event", GTK_SIGNAL_FUNC(gtk_window_enter_callback), (gpointer)this ); @@ -3022,7 +2769,7 @@ bool wxWindowGTK::Destroy() { wxASSERT_MSG( (m_widget != NULL), wxT("invalid window") ); - m_hasVMT = FALSE; + m_hasVMT = false; return wxWindowBase::Destroy(); } @@ -3042,7 +2789,7 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags */ if (m_resizing) return; /* I don't like recursions */ - m_resizing = TRUE; + m_resizing = true; int currentX, currentY; GetPosition(¤tX, ¤tY); @@ -3100,22 +2847,24 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags 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; + left_border = 6; + right_border = 6; + top_border = 6; bottom_border = 5; } -#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) @@ -3143,15 +2892,11 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags GetEventHandler()->ProcessEvent( event ); } - m_resizing = FALSE; + m_resizing = false; } void wxWindowGTK::OnInternalIdle() { -#ifdef __WXGTK20__ - if ( m_dirtyTabOrder ) - RealizeTabOrder(); -#endif // Update style if the window was not yet realized // and SetBackgroundStyle(wxBG_STYLE_CUSTOM) was called if (m_needsStyleChange) @@ -3421,12 +3166,12 @@ void wxWindowGTK::DoScreenToClient( int *x, int *y ) const 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) @@ -3439,7 +3184,7 @@ bool wxWindowGTK::Show( bool show ) GetEventHandler()->ProcessEvent(eventShow); - return TRUE; + return true; } static void wxWindowNotifyEnable(wxWindowGTK* win, bool enable) @@ -3461,12 +3206,12 @@ 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 ); @@ -3475,7 +3220,7 @@ bool wxWindowGTK::Enable( bool enable ) wxWindowNotifyEnable(this, enable); - return TRUE; + return true; } int wxWindowGTK::GetCharHeight() const @@ -3485,31 +3230,9 @@ 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 ); - - if (!context) - return 0; - - PangoFontDescription *desc = font.GetNativeFontInfo()->description; - PangoLayout *layout = pango_layout_new(context); - pango_layout_set_font_description(layout, desc); - pango_layout_set_text(layout, "H", 1); - PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; - - PangoRectangle rect; - pango_layout_line_get_extents(line, NULL, &rect); - - g_object_unref( G_OBJECT( layout ) ); - - return (int) PANGO_PIXELS(rect.height); -#else GdkFont *gfont = font.GetInternalFont( 1.0 ); return gfont->ascent + gfont->descent; -#endif } int wxWindowGTK::GetCharWidth() const @@ -3519,99 +3242,34 @@ 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 ); - - if (!context) - return 0; - - PangoFontDescription *desc = font.GetNativeFontInfo()->description; - PangoLayout *layout = pango_layout_new(context); - pango_layout_set_font_description(layout, desc); - pango_layout_set_text(layout, "g", 1); - PangoLayoutLine *line = (PangoLayoutLine *)pango_layout_get_lines(layout)->data; - - PangoRectangle rect; - pango_layout_line_get_extents(line, NULL, &rect); - - g_object_unref( G_OBJECT( layout ) ); - - return (int) PANGO_PIXELS(rect.width); -#else GdkFont *gfont = font.GetInternalFont( 1.0 ); return gdk_string_width( gfont, "g" ); -#endif } 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 (x) (*x) = 0; - if (y) (*y) = 0; - return; - } - -#ifdef __WXGTK20__ - PangoContext *context = NULL; - if (m_widget) - context = gtk_widget_get_pango_context( m_widget ); - - if (!context) + if (string.empty()) { if (x) (*x) = 0; if (y) (*y) = 0; return; } - PangoFontDescription *desc = fontToUse.GetNativeFontInfo()->description; - PangoLayout *layout = pango_layout_new(context); - pango_layout_set_font_description(layout, desc); - { -#if wxUSE_UNICODE - const wxCharBuffer data = wxConvUTF8.cWC2MB( string ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); -#else - const wxWCharBuffer wdata = wxConvLocal.cMB2WC( string ); - const wxCharBuffer data = wxConvUTF8.cWC2MB( wdata ); - pango_layout_set_text(layout, (const char*) data, strlen( (const char*) data )); -#endif - } - - PangoRectangle rect; - pango_layout_get_extents(layout, NULL, &rect); - - if (x) (*x) = (wxCoord) PANGO_PIXELS(rect.width); - if (y) (*y) = (wxCoord) PANGO_PIXELS(rect.height); - if (descent) - { - 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() @@ -3632,16 +3290,9 @@ void wxWindowGTK::SetFocus() } else if (m_widget) { -#ifdef __WXGTK20__ - if (GTK_IS_CONTAINER(m_widget)) - { - gtk_widget_child_focus( m_widget, GTK_DIR_TAB_FORWARD ); - } - else -#endif 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 @@ -3662,14 +3313,12 @@ void wxWindowGTK::SetFocus() gtk_widget_grab_focus (m_widget); } } - else -#ifndef __WXGTK20__ + else if (GTK_IS_CONTAINER(m_widget)) { gtk_container_focus( GTK_CONTAINER(m_widget), GTK_DIR_TAB_FORWARD ); } else -#endif { wxLogTrace(TRACE_FOCUS, _T("Can't set focus to %s(%s)"), @@ -3685,7 +3334,7 @@ bool wxWindowGTK::AcceptsFocus() const 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; @@ -3693,7 +3342,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) wxASSERT( GTK_IS_WIDGET(m_widget) ); if ( !wxWindowBase::Reparent(newParent) ) - return FALSE; + return false; wxASSERT( GTK_IS_WIDGET(m_widget) ); @@ -3716,7 +3365,7 @@ bool wxWindowGTK::Reparent( wxWindowBase *newParentBase ) /* reverse: prevent GTK from deleting the widget arbitrarily */ gtk_widget_unref( m_widget ); - return TRUE; + return true; } void wxWindowGTK::DoAddChild(wxWindowGTK *child) @@ -3734,62 +3383,6 @@ void wxWindowGTK::DoAddChild(wxWindowGTK *child) (*m_insertCallback)(this, child); } -#ifdef __WXGTK20__ - -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.size() > 0) - { - GList *chain = NULL; - - for (wxWindowList::const_iterator i = m_children.begin(); - i != m_children.end(); ++i) - { - chain = g_list_prepend(chain, (*i)->m_widget); - } - - chain = g_list_reverse(chain); - - gtk_container_set_focus_chain(GTK_CONTAINER(m_wxwindow), chain); - g_list_free(chain); - } - else - { - gtk_container_unset_focus_chain(GTK_CONTAINER(m_wxwindow)); - } - } - - m_dirtyTabOrder = false; -} - -#endif // __WXGTK20__ - void wxWindowGTK::Raise() { wxCHECK_RET( (m_widget != NULL), wxT("invalid window") ); @@ -3798,7 +3391,7 @@ void wxWindowGTK::Raise() { gdk_window_raise( m_wxwindow->window ); } - else if (m_widget->window) + else if (m_widget->window) { gdk_window_raise( m_widget->window ); } @@ -3812,7 +3405,7 @@ void wxWindowGTK::Lower() { gdk_window_lower( m_wxwindow->window ); } - else if (m_widget->window) + else if (m_widget->window) { gdk_window_lower( m_widget->window ); } @@ -3820,10 +3413,10 @@ void wxWindowGTK::Lower() 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(); @@ -3854,35 +3447,37 @@ void wxWindowGTK::WarpPointer( int x, int y ) void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) { - if (!m_widget) return; - if (!m_widget->window) return; + if (!m_widget) + return; + if (!m_widget->window) + return; -#ifndef __WXGTK20__ if (g_isIdle) wxapp_install_idle_handler(); - wxRect myRect(0,0,0,0); + wxRect myRect; if (m_wxwindow && rect) { myRect.SetSize(wxSize( m_wxwindow->allocation.width, m_wxwindow->allocation.height)); - myRect.Intersect(*rect); - if (!myRect.width || !myRect.height) + if ( myRect.Intersect(*rect).IsEmpty() ) + { // nothing to do, rectangle is empty return; + } + rect = &myRect; } + // schedule the area for later updating in GtkUpdate() 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 ); } @@ -3892,7 +3487,6 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) { if (m_wxwindow) { - // Schedule for later Updating in ::Update() or ::OnInternalIdle(). m_updateRegion.Union( rect->x, rect->y, rect->width, rect->height ); } else @@ -3909,7 +3503,6 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) { 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 ); } @@ -3918,24 +3511,6 @@ void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) gtk_widget_draw( m_widget, (GdkRectangle*) NULL ); } } -#else - if (m_wxwindow) - { - 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 ); - } - else - { - gdk_window_invalidate_rect( GTK_PIZZA(m_wxwindow)->bin_window, NULL, TRUE ); - } - } -#endif } void wxWindowGTK::Update() @@ -3943,7 +3518,7 @@ void wxWindowGTK::Update() GtkUpdate(); // when we call Update() we really want to update the window immediately on - // screen, even if itmeans flushing the entire queue and hence slowing down + // 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(); @@ -3951,28 +3526,31 @@ void wxWindowGTK::Update() 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); @@ -3980,9 +3558,7 @@ void wxWindowGTK::GtkSendPaintEvents() if (GetThemeEnabled() && (GetBackgroundStyle() == wxBG_STYLE_SYSTEM)) { // find ancestor from which to steal background - wxWindow *parent = IsTopLevel() ? this : GetParent(); - while (parent && !parent->IsTopLevel()) - parent = parent->GetParent(); + wxWindow *parent = wxGetTopLevelParent((wxWindow *)this); if (!parent) parent = (wxWindow*)this; @@ -4006,23 +3582,12 @@ void wxWindowGTK::GtkSendPaintEvents() (char *)"base", 0, 0, -1, -1 ); - upd ++; + ++upd; } } } else -#ifdef __WXGTK20__ - { - wxWindowDC dc( (wxWindow*)this ); - dc.SetClippingRegion( m_updateRegion ); - - wxEraseEvent erase_event( GetId(), &dc ); - erase_event.SetEventObject( this ); - - GetEventHandler()->ProcessEvent(erase_event); - } -#else // if (!m_clearRegion.IsEmpty()) // Always send an erase event under GTK 1.2 { wxWindowDC dc( (wxWindow*)this ); @@ -4053,7 +3618,6 @@ void wxWindowGTK::GtkSendPaintEvents() } m_clearRegion.Clear(); } -#endif wxNcPaintEvent nc_paint_event( GetId() ); nc_paint_event.SetEventObject( this ); @@ -4063,10 +3627,9 @@ void wxWindowGTK::GtkSendPaintEvents() paint_event.SetEventObject( this ); GetEventHandler()->ProcessEvent( paint_event ); - m_clipPaintRegion = FALSE; + m_clipPaintRegion = false; -#ifndef __WXUNIVERSAL__ -#ifndef __WXGTK20__ +#if !defined(__WXUNIVERSAL__) // 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. @@ -4087,6 +3650,7 @@ void wxWindowGTK::GtkSendPaintEvents() gdk_event.type = GDK_EXPOSE; gdk_event.window = pizza->bin_window; gdk_event.count = 0; + gdk_event.send_event = TRUE; wxRegionIterator upd( m_updateRegion ); while (upd) @@ -4106,8 +3670,7 @@ void wxWindowGTK::GtkSendPaintEvents() } } } -#endif -#endif +#endif // native GTK 1 m_updateRegion.Clear(); } @@ -4116,7 +3679,6 @@ void wxWindowGTK::ClearBackground() { wxCHECK_RET( m_widget != NULL, wxT("invalid window") ); -#ifndef __WXGTK20__ if (m_wxwindow && m_wxwindow->window) { m_clearRegion.Clear(); @@ -4126,7 +3688,6 @@ void wxWindowGTK::ClearBackground() // Better do this in idle? GtkUpdate(); } -#endif } #if wxUSE_TOOLTIPS @@ -4147,7 +3708,7 @@ void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) 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; @@ -4168,13 +3729,13 @@ bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) 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. @@ -4188,21 +3749,6 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) 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? @@ -4217,25 +3763,20 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) if ( m_font.Ok() ) { -#ifdef __WXGTK20__ - 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; } @@ -4248,23 +3789,23 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) 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; } @@ -4285,13 +3826,14 @@ void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) { if (m_wxwindow) gtk_widget_modify_style(m_wxwindow, style); - gtk_widget_modify_style(m_widget, style); + else + gtk_widget_modify_style(m_widget, style); } bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) { wxWindowBase::SetBackgroundStyle(style); - + if (style == wxBG_STYLE_CUSTOM) { GdkWindow *window = (GdkWindow*) NULL; @@ -4314,7 +3856,7 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) else // Do in OnIdle, because the window is not yet available m_needsStyleChange = true; - + // Don't apply widget style, or we get a grey background } else @@ -4326,119 +3868,6 @@ bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style) return true; } -//----------------------------------------------------------------------------- -// Pop-up menu stuff -//----------------------------------------------------------------------------- - -#if wxUSE_MENUS_NATIVE - -extern "C" -void gtk_pop_hide_callback( GtkWidget *WXUNUSED(widget), bool* is_waiting ) -{ - *is_waiting = FALSE; -} - -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" void wxPopupMenuPositionCallback( GtkMenu *menu, - gint *x, gint *y, -#ifdef __WXGTK20__ - gboolean * WXUNUSED(whatever), -#endif - gpointer user_data ) -{ - // 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; -} - -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") ); - - // NOTE: if you change this code, you need to update - // the same code in taskbar.cpp as well. This - // is ugly code duplication, I know, - - SetInvokingWindow( menu, this ); - - menu->UpdateUI(); - - bool is_waiting = true; - - gulong handler = 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 - { - pos = ClientToScreen(wxPoint(x, y)); - userdata = &pos; - posfunc = wxPopupMenuPositionCallback; - } - - 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 -#endif - ); - - while (is_waiting) - { - gtk_main_iteration(); - } - - gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); - - return true; -} - -#endif // wxUSE_MENUS_NATIVE - #if wxUSE_DRAG_AND_DROP void wxWindowGTK::SetDropTarget( wxDropTarget *dropTarget ) @@ -4475,14 +3904,14 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window ) 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; } @@ -4513,7 +3942,7 @@ void wxWindowGTK::DoCaptureMouse() cursor->GetCursor(), (guint32)GDK_CURRENT_TIME ); g_captureWindow = this; - g_captureWindowHasMouse = TRUE; + g_captureWindowHasMouse = true; } void wxWindowGTK::DoReleaseMouse() @@ -4544,7 +3973,7 @@ wxWindow *wxWindowBase::GetCapture() bool wxWindowGTK::IsRetained() const { - return FALSE; + return false; } void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible, @@ -4554,7 +3983,7 @@ 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) { @@ -4611,55 +4040,38 @@ void wxWindowGTK::SetScrollbar( int orient, int pos, int thumbVisible, gtk_signal_emit_by_name( GTK_OBJECT(m_vAdjust), "changed" ); } +void wxWindowGTK::GtkUpdateScrollbar(int orient) +{ + GtkAdjustment *adj = orient == wxHORIZONTAL ? m_hAdjust : m_vAdjust; + GtkSignalFunc fn = orient == wxHORIZONTAL + ? (GtkSignalFunc)gtk_window_hscroll_callback + : (GtkSignalFunc)gtk_window_vscroll_callback; + + gtk_signal_disconnect_by_func(GTK_OBJECT(adj), fn, (gpointer)this); + gtk_signal_emit_by_name(GTK_OBJECT(adj), "value_changed"); + gtk_signal_connect(GTK_OBJECT(adj), "value_changed", fn, (gpointer)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 ); - } } } @@ -4708,7 +4120,6 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) // No scrolling requested. if ((dx == 0) && (dy == 0)) return; -#ifndef __WXGTK20__ if (!m_updateRegion.IsEmpty()) { m_updateRegion.Offset( dx, dy ); @@ -4728,15 +4139,19 @@ void wxWindowGTK::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) 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. @@ -4777,8 +4192,19 @@ wxPoint wxGetMousePosition() } +// 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 @@ -4798,7 +4224,7 @@ bool wxWinModule::OnInit() // g_eraseGC = gdk_gc_new( GDK_ROOT_PARENT() ); // gdk_gc_set_fill( g_eraseGC, GDK_SOLID ); - return TRUE; + return true; } void wxWinModule::OnExit() @@ -4807,4 +4233,3 @@ void wxWinModule::OnExit() gdk_gc_unref( g_eraseGC ); } -// vi:sts=4:sw=4:et