X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..818e52c20151ce0c22aa752ccbab94f1ae7afc99:/src/gtk1/window.cpp diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 96a880d688..4c95e23186 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -21,8 +21,10 @@ #include "wx/utils.h" #include "wx/dialog.h" #include "wx/msgdlg.h" -#include "wx/dcclient.h" +#if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" +#endif +#include "wx/tooltip.h" #include "wx/menu.h" #include "wx/statusbr.h" #include "wx/intl.h" @@ -130,14 +132,14 @@ #ifdef __WXDEBUG__ -static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), - GdkEvent *WXUNUSED(event), - const char *name ) +static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), + GdkEvent *WXUNUSED(event), + const char *name ) { printf( "FOCUS NOW AT: " ); printf( name ); printf( "\n" ); - + return FALSE; } @@ -148,9 +150,9 @@ void debug_focus_in( GtkWidget* widget, const char* name, const char *window ) wxString tmp = name; tmp += " FROM "; tmp += window; - + char *s = new char[tmp.Length()+1]; - + strcpy( s, WXSTRINGCAST tmp ); gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event", @@ -316,7 +318,7 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e if (!key_code) return FALSE; - wxKeyEvent event( wxEVT_CHAR ); + wxKeyEvent event( wxEVT_KEY_DOWN ); 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); @@ -343,38 +345,154 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e ancestor = ancestor->GetParent(); } } - + // win is a control: tab can be propagated up - if ((!ret) && (gdk_event->keyval == GDK_Tab)) + if ((!ret) && (gdk_event->keyval == GDK_Tab) && ((win->m_windowStyle & wxTE_PROCESS_TAB) == 0)) { wxNavigationKeyEvent new_event; new_event.SetDirection( !(gdk_event->state & GDK_SHIFT_MASK) ); - new_event.SetWindowChange( FALSE ); + new_event.SetWindowChange( FALSE ); new_event.SetCurrentFocus( win ); - ret = win->GetEventHandler()->ProcessEvent( new_event ); + ret = win->GetEventHandler()->ProcessEvent( new_event ); } - + /* // win is a panel: up can be propagated to the panel if ((!ret) && (win->m_wxwindow) && (win->m_parent) && (win->m_parent->AcceptsFocus()) && (gdk_event->keyval == GDK_Up)) { win->m_parent->SetFocus(); - ret = TRUE; + ret = TRUE; } - + // win is a panel: left/right can be propagated to the panel - if ((!ret) && (win->m_wxwindow) && - ((gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Left) || + if ((!ret) && (win->m_wxwindow) && + ((gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Left) || (gdk_event->keyval == GDK_Up) || (gdk_event->keyval == GDK_Down))) { wxNavigationKeyEvent new_event; new_event.SetDirection( (gdk_event->keyval == GDK_Right) || (gdk_event->keyval == GDK_Down) ); new_event.SetCurrentFocus( win ); - ret = win->GetEventHandler()->ProcessEvent( new_event ); + ret = win->GetEventHandler()->ProcessEvent( new_event ); + } +*/ + + if (ret) + { + gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); } + + return ret; +} + +//----------------------------------------------------------------------------- +// "key_release_event" from any window +//----------------------------------------------------------------------------- + +static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxWindow *win ) +{ + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + +/* + printf( "OnKeyRelease from " ); + if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) + printf( win->GetClassInfo()->GetClassName() ); + printf( ".\n" ); */ - + + long key_code = 0; + switch (gdk_event->keyval) + { + case GDK_BackSpace: key_code = WXK_BACK; break; + case GDK_Tab: key_code = WXK_TAB; break; + case GDK_Linefeed: key_code = WXK_RETURN; break; + case GDK_Clear: key_code = WXK_CLEAR; break; + case GDK_Return: key_code = WXK_RETURN; break; + case GDK_Pause: key_code = WXK_PAUSE; break; + case GDK_Scroll_Lock: key_code = WXK_SCROLL; break; + case GDK_Escape: key_code = WXK_ESCAPE; break; + case GDK_Delete: key_code = WXK_DELETE; break; + case GDK_Home: key_code = WXK_HOME; break; + case GDK_Left: key_code = WXK_LEFT; break; + case GDK_Up: key_code = WXK_UP; break; + case GDK_Right: key_code = WXK_RIGHT; break; + case GDK_Down: key_code = WXK_DOWN; break; + case GDK_Prior: key_code = WXK_PRIOR; break; +// case GDK_Page_Up: key_code = WXK_PAGEUP; break; + case GDK_Next: key_code = WXK_NEXT; break; +// case GDK_Page_Down: key_code = WXK_PAGEDOWN; break; + case GDK_End: key_code = WXK_END; break; + case GDK_Begin: key_code = WXK_HOME; break; + case GDK_Select: key_code = WXK_SELECT; break; + case GDK_Print: key_code = WXK_PRINT; break; + case GDK_Execute: key_code = WXK_EXECUTE; break; + case GDK_Insert: key_code = WXK_INSERT; break; + case GDK_Num_Lock: key_code = WXK_NUMLOCK; break; + case GDK_KP_Tab: key_code = WXK_TAB; break; + case GDK_KP_Enter: key_code = WXK_RETURN; break; + case GDK_KP_Home: key_code = WXK_HOME; break; + case GDK_KP_Left: key_code = WXK_LEFT; break; + case GDK_KP_Up: key_code = WXK_UP; break; + case GDK_KP_Right: key_code = WXK_RIGHT; break; + case GDK_KP_Down: key_code = WXK_DOWN; break; + case GDK_KP_Prior: key_code = WXK_PRIOR; break; +// case GDK_KP_Page_Up: key_code = WXK_PAGEUP; break; + case GDK_KP_Next: key_code = WXK_NEXT; break; +// case GDK_KP_Page_Down: key_code = WXK_PAGEDOWN; break; + case GDK_KP_End: key_code = WXK_END; break; + case GDK_KP_Begin: key_code = WXK_HOME; break; + case GDK_KP_Insert: key_code = WXK_INSERT; break; + case GDK_KP_Delete: key_code = WXK_DELETE; break; + case GDK_KP_Multiply: key_code = WXK_MULTIPLY; break; + case GDK_KP_Add: key_code = WXK_ADD; break; + case GDK_KP_Separator: key_code = WXK_SEPARATOR; break; + case GDK_KP_Subtract: key_code = WXK_SUBTRACT; break; + case GDK_KP_Decimal: key_code = WXK_DECIMAL; break; + case GDK_KP_Divide: key_code = WXK_DIVIDE; break; + case GDK_KP_0: key_code = WXK_NUMPAD0; break; + case GDK_KP_1: key_code = WXK_NUMPAD1; break; + case GDK_KP_2: key_code = WXK_NUMPAD2; break; + case GDK_KP_3: key_code = WXK_NUMPAD3; break; + case GDK_KP_4: key_code = WXK_NUMPAD4; break; + case GDK_KP_5: key_code = WXK_NUMPAD5; break; + case GDK_KP_6: key_code = WXK_NUMPAD6; break; + case GDK_KP_7: key_code = WXK_NUMPAD7; break; + case GDK_KP_8: key_code = WXK_NUMPAD7; break; + case GDK_KP_9: key_code = WXK_NUMPAD9; break; + case GDK_F1: key_code = WXK_F1; break; + case GDK_F2: key_code = WXK_F2; break; + case GDK_F3: key_code = WXK_F3; break; + case GDK_F4: key_code = WXK_F4; break; + case GDK_F5: key_code = WXK_F5; break; + case GDK_F6: key_code = WXK_F6; break; + case GDK_F7: key_code = WXK_F7; break; + case GDK_F8: key_code = WXK_F8; break; + case GDK_F9: key_code = WXK_F9; break; + case GDK_F10: key_code = WXK_F10; break; + case GDK_F11: key_code = WXK_F11; break; + case GDK_F12: key_code = WXK_F12; break; + default: + { + if ((gdk_event->keyval >= 0x20) && (gdk_event->keyval <= 0xFF)) + key_code = gdk_event->keyval; + } + } + + if (!key_code) return FALSE; + + wxKeyEvent event( wxEVT_KEY_UP ); + 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_keyCode = key_code; + event.m_x = 0; + event.m_y = 0; + event.SetEventObject( win ); + + bool ret = win->GetEventHandler()->ProcessEvent( event ); + if (ret) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); @@ -470,37 +588,37 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton while (node) { wxWindow *child = (wxWindow*)node->Data(); - - if (child->m_isStaticBox) - { - // wxStaticBox is transparent in the box itself - int x = event.m_x; - int y = event.m_y; - int xx1 = child->m_x; - int yy1 = child->m_y; - int xx2 = child->m_x + child->m_width; - int yy2 = child->m_x + child->m_height; - - // left - if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || - // right - ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || - // top - ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || - // bottom - ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) - { + + if (child->m_isStaticBox) + { + // wxStaticBox is transparent in the box itself + int x = event.m_x; + int y = event.m_y; + int xx1 = child->m_x; + int yy1 = child->m_y; + int xx2 = child->m_x + child->m_width; + int yy2 = child->m_x + child->m_height; + + // left + if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || + // right + ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || + // top + ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || + // bottom + ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) + { win = child; event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } - - } - else - { + } + + } + else + { if ((child->m_wxwindow == (GtkWidget*) NULL) && - (child->m_x <= event.m_x) && + (child->m_x <= event.m_x) && (child->m_y <= event.m_y) && (child->m_x+child->m_width >= event.m_x) && (child->m_y+child->m_height >= event.m_y)) @@ -509,12 +627,16 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } + } } node = node->Next(); } } + wxPoint pt(win->GetClientAreaOrigin()); + event.m_x -= pt.x; + event.m_y -= pt.y; + event.SetEventObject( win ); gs_timeLastClick = gdk_event->time; @@ -574,37 +696,37 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto while (node) { wxWindow *child = (wxWindow*)node->Data(); - - if (child->m_isStaticBox) - { - // wxStaticBox is transparent in the box itself - int x = event.m_x; - int y = event.m_y; - int xx1 = child->m_x; - int yy1 = child->m_y; - int xx2 = child->m_x + child->m_width; - int yy2 = child->m_x + child->m_height; - - // left - if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || - // right - ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || - // top - ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || - // bottom - ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) - { + + if (child->m_isStaticBox) + { + // wxStaticBox is transparent in the box itself + int x = event.m_x; + int y = event.m_y; + int xx1 = child->m_x; + int yy1 = child->m_y; + int xx2 = child->m_x + child->m_width; + int yy2 = child->m_x + child->m_height; + + // left + if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || + // right + ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || + // top + ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || + // bottom + ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) + { win = child; event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } - - } - else - { + } + + } + else + { if ((child->m_wxwindow == (GtkWidget*) NULL) && - (child->m_x <= event.m_x) && + (child->m_x <= event.m_x) && (child->m_y <= event.m_y) && (child->m_x+child->m_width >= event.m_x) && (child->m_y+child->m_height >= event.m_y)) @@ -613,12 +735,16 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } + } } node = node->Next(); } } + wxPoint pt(win->GetClientAreaOrigin()); + event.m_x -= pt.x; + event.m_y -= pt.y; + event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) @@ -633,6 +759,17 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion *gdk_event, wxWindow *win ) { + if (gdk_event->is_hint) + { + int x = 0; + int y = 0; + GdkModifierType state; + gdk_window_get_pointer(gdk_event->window, &x, &y, &state); + gdk_event->x = x; + gdk_event->y = y; + gdk_event->state = state; + } + if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; if (g_blockEventsOnDrag) return TRUE; @@ -645,7 +782,7 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) printf( win->GetClassInfo()->GetClassName() ); printf( ".\n" ); -*/ +*/ wxMouseEvent event( wxEVT_MOTION ); event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK); @@ -668,37 +805,37 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion while (node) { wxWindow *child = (wxWindow*)node->Data(); - - if (child->m_isStaticBox) - { - // wxStaticBox is transparent in the box itself - int x = event.m_x; - int y = event.m_y; - int xx1 = child->m_x; - int yy1 = child->m_y; - int xx2 = child->m_x + child->m_width; - int yy2 = child->m_x + child->m_height; - - // left - if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || - // right - ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || - // top - ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || - // bottom - ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) - { + + if (child->m_isStaticBox) + { + // wxStaticBox is transparent in the box itself + int x = event.m_x; + int y = event.m_y; + int xx1 = child->m_x; + int yy1 = child->m_y; + int xx2 = child->m_x + child->m_width; + int yy2 = child->m_x + child->m_height; + + // left + if (((x >= xx1) && (x <= xx1+10) && (y >= yy1) && (y <= yy2)) || + // right + ((x >= xx2-10) && (x <= xx2) && (y >= yy1) && (y <= yy2)) || + // top + ((x >= xx1) && (x <= xx2) && (y >= yy1) && (y <= yy1+10)) || + // bottom + ((x >= xx1) && (x <= xx2) && (y >= yy2-1) && (y <= yy2))) + { win = child; event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } - - } - else - { + } + + } + else + { if ((child->m_wxwindow == (GtkWidget*) NULL) && - (child->m_x <= event.m_x) && + (child->m_x <= event.m_x) && (child->m_y <= event.m_y) && (child->m_x+child->m_width >= event.m_x) && (child->m_y+child->m_height >= event.m_y)) @@ -707,12 +844,16 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion event.m_x -= child->m_x; event.m_y -= child->m_y; break; - } + } } node = node->Next(); } } + wxPoint pt(win->GetClientAreaOrigin()); + event.m_x -= pt.x; + event.m_y -= pt.y; + event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) @@ -728,9 +869,9 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) { if (g_blockEventsOnDrag) return TRUE; - + g_focusWindow = win; - + if (win->m_wxwindow) { if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) @@ -820,13 +961,13 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_ wxMouseEvent event( wxEVT_ENTER_WINDOW ); event.SetEventObject( win ); - + int x = 0; int y = 0; GdkModifierType state = (GdkModifierType)0; - + gdk_window_get_pointer( widget->window, &x, &y, &state ); - + event.m_shiftDown = (state & GDK_SHIFT_MASK); event.m_controlDown = (state & GDK_CONTROL_MASK); event.m_altDown = (state & GDK_MOD1_MASK); @@ -837,7 +978,11 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_ event.m_x = (long)x; event.m_y = (long)y; - + + wxPoint pt(win->GetClientAreaOrigin()); + event.m_x -= pt.x; + event.m_y -= pt.y; + if (win->GetEventHandler()->ProcessEvent( event )) gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "enter_notify_event" ); @@ -872,9 +1017,9 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ int x = 0; int y = 0; GdkModifierType state = (GdkModifierType)0; - + gdk_window_get_pointer( widget->window, &x, &y, &state ); - + event.m_shiftDown = (state & GDK_SHIFT_MASK); event.m_controlDown = (state & GDK_CONTROL_MASK); event.m_altDown = (state & GDK_MOD1_MASK); @@ -885,7 +1030,11 @@ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_ event.m_x = (long)x; event.m_y = (long)y; - + + wxPoint pt(win->GetClientAreaOrigin()); + event.m_x -= pt.x; + event.m_y -= pt.y; + if (win->GetEventHandler()->ProcessEvent( event )) gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "leave_notify_event" ); @@ -1042,7 +1191,7 @@ static void gtk_window_hscroll_change_callback( GtkWidget *WXUNUSED(widget), wxW static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), GdkEventButton *WXUNUSED(gdk_event), - wxWindow *win ) + wxWindow *win ) { // don't test here as we can release the mouse while being over // a different window then the slider @@ -1061,7 +1210,7 @@ static gint gtk_scrollbar_button_press_callback( GtkRange *WXUNUSED(widget), static gint gtk_scrollbar_button_release_callback( GtkRange *widget, GdkEventButton *WXUNUSED(gdk_event), - wxWindow *win ) + wxWindow *win ) { // don't test here as we can release the mouse while being over @@ -1086,23 +1235,44 @@ static gint gtk_scrollbar_button_release_callback( GtkRange *widget, // InsertChild for wxWindow. //----------------------------------------------------------------------------- -// Callback for wxWindow. This very strange beast has to be used because -// C++ has no virtual methods in a constructor. We have to emulate a -// virtual function here as wxNotebook requires a different way to insert -// a child in it. I had opted for creating a wxNotebookPage window class -// which would have made this superfluous (such in the MDI window system), -// but no-one was listening to me... +/* Callback for wxWindow. This very strange beast has to be used because + * C++ has no virtual methods in a constructor. We have to emulate a + * virtual function here as wxNotebook requires a different way to insert + * a child in it. I had opted for creating a wxNotebookPage window class + * which would have made this superfluous (such in the MDI window system), + * but no-one was listening to me... */ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child ) { gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow), GTK_WIDGET(child->m_widget), - child->m_x, - child->m_y ); + child->m_x, + child->m_y ); gtk_widget_set_usize( GTK_WIDGET(child->m_widget), child->m_width, - child->m_height ); + child->m_height ); + + if (wxIS_KIND_OF(parent,wxFrame)) + { + parent->m_sizeSet = FALSE; + } + + if (parent->m_windowStyle & wxTAB_TRAVERSAL) + { + /* we now allow a window to get the focus as long as it + doesn't have any children. */ + GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS ); + } +} + +//----------------------------------------------------------------------------- +// global functions +//----------------------------------------------------------------------------- + +wxWindow* wxGetActiveWindow() +{ + return g_focusWindow; } //----------------------------------------------------------------------------- @@ -1115,7 +1285,7 @@ BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler) EVT_SIZE(wxWindow::OnSize) EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged) EVT_INIT_DIALOG(wxWindow::OnInitDialog) - EVT_IDLE(wxWindow::OnIdle) + EVT_KEY_DOWN(wxWindow::OnKeyDown) END_EVENT_TABLE() wxWindow::wxWindow() @@ -1166,7 +1336,9 @@ wxWindow::wxWindow() m_isShown = FALSE; m_isEnabled = TRUE; +#if wxUSE_DRAG_AND_DROP m_dropTarget = (wxDropTarget*) NULL; +#endif m_resizing = FALSE; m_scrollGC = (GdkGC*) NULL; m_widgetStyle = (GtkStyle*) NULL; @@ -1175,9 +1347,13 @@ wxWindow::wxWindow() m_clientObject = (wxClientData*) NULL; m_clientData = NULL; - + m_isStaticBox = FALSE; m_acceptsFocus = FALSE; + +#if wxUSE_TOOLTIPS + m_toolTip = (wxToolTip*) NULL; +#endif // wxUSE_TOOLTIPS } wxWindow::wxWindow( wxWindow *parent, wxWindowID id, @@ -1200,7 +1376,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); - + #ifdef __WXDEBUG__ debug_focus_in( m_widget, "wxWindow::m_widget", name ); #endif @@ -1254,9 +1430,11 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE ); } - if ((m_windowStyle & wxTAB_TRAVERSAL) != 0) + if (m_windowStyle & wxTAB_TRAVERSAL) { - GTK_WIDGET_UNSET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); + /* we now allow a window to get the focus as long as it + doesn't have any children. */ + GTK_WIDGET_SET_FLAGS( m_wxwindow, GTK_CAN_FOCUS ); m_acceptsFocus = FALSE; } else @@ -1332,7 +1510,13 @@ wxWindow::~wxWindow() { m_hasVMT = FALSE; - if (m_dropTarget) delete m_dropTarget; +#if wxUSE_DRAG_AND_DROP + wxDELETE(m_dropTarget); +#endif + +#if wxUSE_TOOLTIPS + wxDELETE(m_toolTip); +#endif // wxUSE_TOOLTIPS if (m_parent) m_parent->RemoveChild( this ); if (m_widget) Show( FALSE ); @@ -1451,7 +1635,9 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, m_isShown = FALSE; m_isEnabled = TRUE; +#if wxUSE_DRAG_AND_DROP m_dropTarget = (wxDropTarget *) NULL; +#endif m_resizing = FALSE; m_windowValidator = (wxValidator *) NULL; m_scrollGC = (GdkGC*) NULL; @@ -1459,8 +1645,12 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, m_clientObject = (wxClientData*)NULL; m_clientData = NULL; - + m_isStaticBox = FALSE; + +#if wxUSE_TOOLTIPS + m_toolTip = (wxToolTip*) NULL; +#endif // wxUSE_TOOLTIPS } void wxWindow::PostCreation() @@ -1490,6 +1680,9 @@ void wxWindow::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 ); @@ -1523,9 +1716,15 @@ bool wxWindow::Close( bool force ) wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); event.SetEventObject(this); - event.SetForce(force); + event.SetCanVeto(!force); + + (void)GetEventHandler()->ProcessEvent(event); - return GetEventHandler()->ProcessEvent(event); + // when we're forced to close we do it anyhow, otherwise only if the + // application didn't forbid it (if the event wasn't processed, GetVeto() + // will return FALSE too) + if ( force || !event.GetVeto() ) + Destroy(); } bool wxWindow::Destroy() @@ -1639,6 +1838,11 @@ void wxWindow::SetSize( int x, int y, int width, int height, int sizeFlags ) m_resizing = FALSE; } +void wxWindow::OnInternalIdle() +{ + UpdateWindowUI(); +} + void wxWindow::SetSize( int width, int height ) { SetSize( -1, -1, width, height, wxSIZE_USE_EXISTING ); @@ -1898,7 +2102,7 @@ void wxWindow::Fit() node = node->Next(); } - + SetClientSize(maxX + 7, maxY + 14); } @@ -1925,9 +2129,9 @@ bool wxWindow::Show( bool show ) gtk_widget_show( m_widget ); else gtk_widget_hide( m_widget ); - + m_isShown = show; - + return TRUE; } @@ -1936,7 +2140,7 @@ void wxWindow::Enable( bool enable ) wxCHECK_RET( (m_widget != NULL), "invalid window" ); m_isEnabled = enable; - + gtk_widget_set_sensitive( m_widget, enable ); if (m_wxwindow) gtk_widget_set_sensitive( m_wxwindow, enable ); } @@ -1948,7 +2152,7 @@ int wxWindow::GetCharHeight() const wxCHECK_MSG( m_font.Ok(), 12, "invalid font" ); GdkFont *font = m_font.GetInternalFont( 1.0 ); - + return font->ascent + font->descent; } @@ -1959,7 +2163,7 @@ int wxWindow::GetCharWidth() const wxCHECK_MSG( m_font.Ok(), 8, "invalid font" ); GdkFont *font = m_font.GetInternalFont( 1.0 ); - + return gdk_string_width( font, "H" ); } @@ -1981,7 +2185,7 @@ void wxWindow::GetTextExtent( const wxString& string, int *x, int *y, void wxWindow::MakeModal( bool modal ) { return; - + // Disable all other windows if (this->IsKindOf(CLASSINFO(wxDialog)) || this->IsKindOf(CLASSINFO(wxFrame))) { @@ -1996,10 +2200,20 @@ void wxWindow::MakeModal( bool modal ) } } +void wxWindow::OnKeyDown( wxKeyEvent &event ) +{ + event.SetEventType( wxEVT_CHAR ); + + if (!GetEventHandler()->ProcessEvent( event )) + { + event.Skip(); + } +} + void wxWindow::SetFocus() { wxCHECK_RET( (m_widget != NULL), "invalid window" ); - + GtkWidget *connect_widget = GetConnectWidget(); if (connect_widget) { @@ -2007,13 +2221,13 @@ void wxWindow::SetFocus() { gtk_widget_grab_focus (connect_widget); } - else if (GTK_IS_CONTAINER(connect_widget)) - { - gtk_container_focus( GTK_CONTAINER(connect_widget), GTK_DIR_TAB_FORWARD ); - } - else - { - } + else if (GTK_IS_CONTAINER(connect_widget)) + { + gtk_container_focus( GTK_CONTAINER(connect_widget), GTK_DIR_TAB_FORWARD ); + } + else + { + } } } @@ -2027,11 +2241,6 @@ bool wxWindow::AcceptsFocus() const return IsEnabled() && IsShown() && m_acceptsFocus; } -bool wxWindow::OnClose() -{ - return TRUE; -} - void wxWindow::AddChild( wxWindow *child ) { wxCHECK_RET( (m_widget != NULL), "invalid window" ); @@ -2043,7 +2252,7 @@ void wxWindow::AddChild( wxWindow *child ) wxWindow *wxWindow::ReParent( wxWindow *newParent ) { wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, "invalid window" ); - + wxWindow *oldParent = GetParent(); if (oldParent) oldParent->RemoveChild( this ); @@ -2217,12 +2426,12 @@ void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) Clear(); } } - + if (!rect) { if (m_wxwindow) gtk_widget_draw( m_wxwindow, (GdkRectangle*) NULL ); - else + else gtk_widget_draw( m_widget, (GdkRectangle*) NULL ); } else @@ -2272,6 +2481,42 @@ void wxWindow::Clear() if (m_wxwindow && m_wxwindow->window) gdk_window_clear( m_wxwindow->window ); } +#if wxUSE_TOOLTIPS +void wxWindow::SetToolTip( const wxString &tip ) +{ + if (m_toolTip) + { + m_toolTip->SetTip( tip ); + } + else + { + SetToolTip( new wxToolTip( tip ) ); + } + + // setting empty tooltip text does not remove the tooltip any more for + // wxMSW compatibility - use SetToolTip((wxToolTip *)NULL) for this +} + +void wxWindow::SetToolTip( wxToolTip *tip ) +{ + if (m_toolTip) + { + m_toolTip->SetTip( (char*) NULL ); + delete m_toolTip; + } + + m_toolTip = tip; + + if (m_toolTip) + m_toolTip->Apply( this ); +} + +void wxWindow::ApplyToolTip( GtkTooltips *tips, const char *tip ) +{ + gtk_tooltips_set_tip( tips, GetConnectWidget(), tip, (gchar*) NULL ); +} +#endif // wxUSE_TOOLTIPS + wxColour wxWindow::GetBackgroundColour() const { return m_backgroundColour; @@ -2291,18 +2536,17 @@ void wxWindow::SetBackgroundColour( const wxColour &colour ) GdkWindow *window = m_wxwindow->window; m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) ); gdk_window_set_background( window, m_backgroundColour.GetColor() ); - gdk_window_clear( window ); } wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); - if (sysbg.Red() == colour.Red() && - sysbg.Green() == colour.Green() && + if (sysbg.Red() == colour.Red() && + sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) { m_backgroundColour = wxNullColour; ApplyWidgetStyle(); - m_backgroundColour = sysbg; - } + m_backgroundColour = sysbg; + } else { ApplyWidgetStyle(); @@ -2324,14 +2568,14 @@ void wxWindow::SetForegroundColour( const wxColour &colour ) if (!m_foregroundColour.Ok()) return; wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); - if (sysbg.Red() == colour.Red() && - sysbg.Green() == colour.Green() && + if (sysbg.Red() == colour.Red() && + sysbg.Green() == colour.Green() && sysbg.Blue() == colour.Blue()) { m_backgroundColour = wxNullColour; ApplyWidgetStyle(); - m_backgroundColour = sysbg; - } + m_backgroundColour = sysbg; + } else { ApplyWidgetStyle(); @@ -2391,9 +2635,9 @@ bool wxWindow::Validate() { wxWindow *child = (wxWindow *)node->Data(); if (child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->Validate(this)) - { - return FALSE; - } + { + return FALSE; + } node = node->Next(); } return TRUE; @@ -2427,9 +2671,9 @@ bool wxWindow::TransferDataFromWindow() { wxWindow *child = (wxWindow *)node->Data(); if ( child->GetValidator() && /* child->GetValidator()->Ok() && */ !child->GetValidator()->TransferFromWindow() ) - { - return FALSE; - } + { + return FALSE; + } node = node->Next(); } return TRUE; @@ -2463,31 +2707,47 @@ static void SetInvokingWindow( wxMenu *menu, wxWindow *win ) wxMenuItem *menuitem = (wxMenuItem*)node->Data(); if (menuitem->IsSubMenu()) { - SetInvokingWindow( menuitem->GetSubMenu(), win ); - } + SetInvokingWindow( menuitem->GetSubMenu(), win ); + } node = node->Next(); } } -bool wxWindow::PopupMenu( wxMenu *menu, int WXUNUSED(x), int WXUNUSED(y) ) +static gint gs_pop_x = 0; +static gint gs_pop_y = 0; + +static void pop_pos_callback( GtkMenu *menu, gint *x, gint *y, wxWindow *win ) +{ + win->ClientToScreen( &gs_pop_x, &gs_pop_y ); + *x = gs_pop_x; + *y = gs_pop_y; +} + +bool wxWindow::PopupMenu( wxMenu *menu, int x, int y ) { wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" ); wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" ); SetInvokingWindow( menu, this ); + + gs_pop_x = x; + gs_pop_y = y; + gtk_menu_popup( GTK_MENU(menu->m_menu), - (GtkWidget *)NULL, // parent menu shell - (GtkWidget *)NULL, // parent menu item - (GtkMenuPositionFunc)NULL, - NULL, // client data - 0, // button used to activate it - 0//gs_timeLastClick // the time of activation + (GtkWidget *) NULL, // parent menu shell + (GtkWidget *) NULL, // parent menu item + (GtkMenuPositionFunc) pop_pos_callback, + (gpointer) this, // client data + 0, // button used to activate it + 0 //gs_timeLastClick // the time of activation ); return TRUE; } +#if wxUSE_DRAG_AND_DROP + void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) { wxCHECK_RET( m_widget != NULL, "invalid window" ); @@ -2507,6 +2767,8 @@ wxDropTarget *wxWindow::GetDropTarget() const return m_dropTarget; } +#endif + GtkWidget* wxWindow::GetConnectWidget() { GtkWidget *connect_widget = m_widget; @@ -2531,14 +2793,14 @@ void wxWindow::SetFont( const wxFont &font ) m_font = *wxSWISS_FONT; wxColour sysbg = wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNFACE ); - if (sysbg.Red() == m_backgroundColour.Red() && - sysbg.Green() == m_backgroundColour.Green() && + if (sysbg.Red() == m_backgroundColour.Red() && + sysbg.Green() == m_backgroundColour.Green() && sysbg.Blue() == m_backgroundColour.Blue()) { m_backgroundColour = wxNullColour; ApplyWidgetStyle(); - m_backgroundColour = sysbg; - } + m_backgroundColour = sysbg; + } else { ApplyWidgetStyle(); @@ -2568,9 +2830,9 @@ void wxWindow::CaptureMouse() (GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK), - (GdkWindow *) NULL, - (GdkCursor *) NULL, - GDK_CURRENT_TIME ); + (GdkWindow *) NULL, + (GdkCursor *) NULL, + GDK_CURRENT_TIME ); g_capturing = TRUE; } @@ -2739,7 +3001,7 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) 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; - + if (fabs(fpos-m_vAdjust->value) < 0.2) return; m_vAdjust->value = fpos; } @@ -3146,9 +3408,9 @@ void wxWindow::SetConstraintSizes(bool recurse) winName = "unnamed"; else winName = GetName(); - wxLogDebug( "Constraint(s) not satisfied for window of type %s, name %s:\n", - (const char *)windowClass, - (const char *)winName); + wxLogDebug( "Constraint(s) not satisfied for window of type %s, name %s:\n", + (const char *)windowClass, + (const char *)winName); if (!constr->left.GetDone()) wxLogDebug( " unsatisfied 'left' constraint.\n" ); if (!constr->right.GetDone()) wxLogDebug( " unsatisfied 'right' constraint.\n" ); if (!constr->width.GetDone()) wxLogDebug( " unsatisfied 'width' constraint.\n" ); @@ -3283,7 +3545,3 @@ void wxWindow::GetPositionConstraint(int *x, int *y) const GetPosition(x, y); } -void wxWindow::OnIdle(wxIdleEvent& WXUNUSED(event) ) -{ - UpdateWindowUI(); -}