X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c626a8b797d2819e1e14110d77c04a530fd3b6b4..07fa75bc31fd49da3e4bd4a8bf056a96493bf26b:/src/gtk/window.cpp?ds=sidebyside diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 26dabd6d51..a84758ad85 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -121,68 +121,112 @@ */ -//------------------------------------------------------------------------- -// conditional compilation -//------------------------------------------------------------------------- - -#if (GTK_MINOR_VERSION == 1) -#if (GTK_MICRO_VERSION >= 5) -#define NEW_GTK_SCROLL_CODE -#endif -#endif - //----------------------------------------------------------------------------- -// (debug) +// data //----------------------------------------------------------------------------- -#ifdef __WXDEBUG__ +extern wxList wxPendingDelete; +extern bool g_blockEventsOnDrag; +extern bool g_blockEventsOnScroll; +static bool g_capturing = FALSE; +static wxWindow *g_focusWindow = (wxWindow*) NULL; -static gint gtk_debug_focus_in_callback( GtkWidget *WXUNUSED(widget), - GdkEvent *WXUNUSED(event), - const char *name ) -{ - printf( "FOCUS NOW AT: " ); - printf( name ); - printf( "\n" ); +/* 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; - return FALSE; -} +#if (GTK_MINOR_VERSION > 0) + +//----------------------------------------------------------------------------- +// local code (see below) +//----------------------------------------------------------------------------- -void debug_focus_in( GtkWidget* widget, const char* name, const char *window ) +static void draw_frame( GtkWidget *widget, wxWindow *win ) { - return; + if (!win->HasVMT()) return; - wxString tmp = name; - tmp += " FROM "; - tmp += window; + int dw = 0; + int dh = 0; + + if (win->m_hasScrolling) + { + GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(widget); + GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(widget)->klass ); - char *s = new char[tmp.Length()+1]; +/* + GtkWidget *hscrollbar = scroll_window->hscrollbar; + GtkWidget *vscrollbar = scroll_window->vscrollbar; + + we use this instead: range.slider_width = 11 + 2*2pts edge +*/ - strcpy( s, WXSTRINGCAST tmp ); + if (scroll_window->vscrollbar_visible) + { + dw += 15; /* dw += vscrollbar->allocation.width; */ + dw += scroll_class->scrollbar_spacing; + } - gtk_signal_connect( GTK_OBJECT(widget), "focus_in_event", - GTK_SIGNAL_FUNC(gtk_debug_focus_in_callback), (gpointer)s ); + if (scroll_window->hscrollbar_visible) + { + dh += 15; /* dh += hscrollbar->allocation.height; */ + dw += scroll_class->scrollbar_spacing; + } + } + + int dx = 0; + int dy = 0; + if (GTK_WIDGET_NO_WINDOW (widget)) + { + dx += widget->allocation.x; + dy += widget->allocation.y; + } + + if (win->m_windowStyle & wxRAISED_BORDER) + { + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_OUT, + dx, dy, + win->m_width-dw, win->m_height-dh ); + return; + } + + if (win->m_windowStyle & wxSUNKEN_BORDER) + { + gtk_draw_shadow( widget->style, + widget->window, + GTK_STATE_NORMAL, + GTK_SHADOW_IN, + dx, dy, + win->m_width-dw, win->m_height-dh ); + return; + } } -#endif +//----------------------------------------------------------------------------- +// "expose_event" of m_widget +//----------------------------------------------------------------------------- + +static void gtk_window_own_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win ) +{ + if (gdk_event->count > 0) return; + draw_frame( widget, win ); +} //----------------------------------------------------------------------------- -// data +// "draw" of m_wxwindow //----------------------------------------------------------------------------- -extern wxList wxPendingDelete; -extern wxList wxTopLevelWindows; -extern bool g_blockEventsOnDrag; -extern bool g_blockEventsOnScroll; -static bool g_capturing = FALSE; -static wxWindow *g_focusWindow = (wxWindow*) NULL; +static void gtk_window_own_draw_callback( GtkWidget *widget, GdkRectangle *WXUNUSED(rect), wxWindow *win ) +{ + draw_frame( widget, win ); +} -// 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; +#endif //----------------------------------------------------------------------------- -// "expose_event" (of m_wxwindow, not of m_widget) +// "expose_event" of m_wxwindow //----------------------------------------------------------------------------- static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxWindow *win ) @@ -211,7 +255,7 @@ static void gtk_window_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExp } //----------------------------------------------------------------------------- -// "draw" (of m_wxwindow, not of m_widget) +// "draw" of m_wxwindow //----------------------------------------------------------------------------- static void gtk_window_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxWindow *win ) @@ -400,9 +444,10 @@ static gint gtk_window_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_e if (ret) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" ); + return TRUE; } - return ret; + return FALSE; } //----------------------------------------------------------------------------- @@ -512,14 +557,13 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk event.m_y = 0; event.SetEventObject( win ); - bool ret = win->GetEventHandler()->ProcessEvent( event ); - - if (ret) + if (win->GetEventHandler()->ProcessEvent( event )) { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_release_event" ); + return TRUE; } - return ret; + return FALSE; } //----------------------------------------------------------------------------- @@ -528,11 +572,12 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, GdkEventKey *gdk static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) { - if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; - + if (!win->HasVMT()) return FALSE; if (g_blockEventsOnDrag) return TRUE; if (g_blockEventsOnScroll) return TRUE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; + if (win->m_wxwindow) { if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow) && !GTK_WIDGET_HAS_FOCUS (win->m_wxwindow) ) @@ -549,8 +594,6 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton } } - if (!win->HasVMT()) return TRUE; - /* printf( "OnButtonPress from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -654,18 +697,17 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton } } - wxPoint pt(win->GetClientAreaOrigin()); - event.m_x -= pt.x; - event.m_y -= pt.y; - event.SetEventObject( win ); gs_timeLastClick = gdk_event->time; if (win->GetEventHandler()->ProcessEvent( event )) + { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_press_event" ); + return TRUE; + } - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -674,12 +716,11 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, GdkEventButton static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxWindow *win ) { - if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; - - if (g_blockEventsOnDrag) return TRUE; - if (g_blockEventsOnScroll) return TRUE; + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnScroll) return FALSE; - if (!win->HasVMT()) return TRUE; + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; /* printf( "OnButtonRelease from " ); @@ -762,16 +803,15 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto } } - wxPoint pt(win->GetClientAreaOrigin()); - event.m_x -= pt.x; - event.m_y -= pt.y; - event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) + { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "button_release_event" ); + return TRUE; + } - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -780,6 +820,12 @@ 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 (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + if (g_blockEventsOnScroll) return FALSE; + + if (!win->IsOwnGtkWindow( gdk_event->window )) return FALSE; + if (gdk_event->is_hint) { int x = 0; @@ -791,13 +837,6 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion gdk_event->state = state; } - if (!win->IsOwnGtkWindow( gdk_event->window )) return TRUE; - - if (g_blockEventsOnDrag) return TRUE; - if (g_blockEventsOnScroll) return TRUE; - - if (!win->HasVMT()) return TRUE; - /* printf( "OnMotion from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -871,16 +910,15 @@ static gint gtk_window_motion_notify_callback( GtkWidget *widget, GdkEventMotion } } - wxPoint pt(win->GetClientAreaOrigin()); - event.m_x -= pt.x; - event.m_y -= pt.y; - event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) + { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "motion_notify_event" ); + return TRUE; + } - return TRUE; + return FALSE; } //----------------------------------------------------------------------------- @@ -889,7 +927,8 @@ 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; + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; g_focusWindow = win; @@ -907,7 +946,6 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( } } - if (!win->HasVMT()) return TRUE; /* printf( "OnSetFocus from " ); @@ -922,9 +960,12 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) + { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_in_event" ); - - return TRUE; + return TRUE; + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -933,15 +974,15 @@ static gint gtk_window_focus_in_callback( GtkWidget *widget, GdkEvent *WXUNUSED( static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED(event), wxWindow *win ) { - if (g_blockEventsOnDrag) return TRUE; + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + if (win->m_wxwindow) { if (GTK_WIDGET_CAN_FOCUS(win->m_wxwindow)) GTK_WIDGET_UNSET_FLAGS (win->m_wxwindow, GTK_HAS_FOCUS); } - if (!win->HasVMT()) return TRUE; - /* printf( "OnKillFocus from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -953,9 +994,12 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED event.SetEventObject( win ); if (win->GetEventHandler()->ProcessEvent( event )) + { gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus_out_event" ); - - return TRUE; + return TRUE; + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -964,15 +1008,14 @@ static gint gtk_window_focus_out_callback( GtkWidget *widget, GdkEvent *WXUNUSED static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) { - if (g_blockEventsOnDrag) return TRUE; + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + + if (widget->window != gdk_event->window) return FALSE; if ((widget->window) && (win->m_cursor)) gdk_window_set_cursor( widget->window, win->m_cursor->GetCursor() ); - if (widget->window != gdk_event->window) return TRUE; - - if (!win->HasVMT()) return TRUE; - /* printf( "OnEnter from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -1000,14 +1043,13 @@ 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" ); - - return TRUE; + return TRUE; + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -1016,15 +1058,14 @@ static gint gtk_window_enter_callback( GtkWidget *widget, GdkEventCrossing *gdk_ static gint gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxWindow *win ) { - if (g_blockEventsOnDrag) return TRUE; + if (!win->HasVMT()) return FALSE; + if (g_blockEventsOnDrag) return FALSE; + if (widget->window != gdk_event->window) return FALSE; + if ((widget->window) && (win->m_cursor)) gdk_window_set_cursor( widget->window, wxSTANDARD_CURSOR->GetCursor() ); - if (widget->window != gdk_event->window) return TRUE; - - if (!win->HasVMT()) return TRUE; - /* printf( "OnLeave from " ); if (win->GetClassInfo() && win->GetClassInfo()->GetClassName()) @@ -1052,14 +1093,13 @@ 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" ); - - return TRUE; + return TRUE; + } + + return FALSE; } //----------------------------------------------------------------------------- @@ -1276,11 +1316,6 @@ static void wxInsertChildInWindow( wxWindow* parent, wxWindow* child ) child->m_width, 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 @@ -1399,24 +1434,15 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - wxASSERT_MSG( m_isWindow, "Init() must have been called before!" ); + wxASSERT_MSG( m_isWindow, _T("Init() must have been called before!") ); PreCreation( parent, id, pos, size, style, name ); 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 - GtkScrolledWindow *s_window = GTK_SCROLLED_WINDOW(m_widget); -#ifdef __WXDEBUG__ - debug_focus_in( s_window->hscrollbar, "wxWindow::hsrcollbar", name ); - debug_focus_in( s_window->vscrollbar, "wxWindow::vsrcollbar", name ); -#endif - GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); scroll_class->scrollbar_spacing = 0; @@ -1430,21 +1456,25 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_wxwindow = gtk_myfixed_new(); -#ifdef __WXDEBUG__ - debug_focus_in( m_wxwindow, "wxWindow::m_wxwindow", name ); -#endif + gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); + +#if (GTK_MINOR_VERSION > 0) + GtkMyFixed *myfixed = GTK_MYFIXED(m_wxwindow); -#ifdef NEW_GTK_SCROLL_CODE - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), m_wxwindow ); - GtkViewport *viewport = GTK_VIEWPORT(s_window->child); + if (m_windowStyle & wxRAISED_BORDER) + { + gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_OUT ); + } + else if (m_windowStyle & wxSUNKEN_BORDER) + { + gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_IN ); + } + else + { + gtk_myfixed_set_shadow_type( myfixed, GTK_SHADOW_NONE ); + } #else - gtk_container_add( GTK_CONTAINER(m_widget), m_wxwindow ); GtkViewport *viewport = GTK_VIEWPORT(s_window->viewport); -#endif - -#ifdef __WXDEBUG__ - debug_focus_in( GTK_WIDGET(viewport), "wxWindow::viewport", name ); -#endif if (m_windowStyle & wxRAISED_BORDER) { @@ -1458,6 +1488,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, { gtk_viewport_set_shadow_type( viewport, GTK_SHADOW_NONE ); } +#endif if (m_windowStyle & wxTAB_TRAVERSAL) { @@ -1472,9 +1503,11 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, m_acceptsFocus = TRUE; } +#if (GTK_MINOR_VERSION == 0) // shut the viewport up gtk_viewport_set_hadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) ); gtk_viewport_set_vadjustment( viewport, (GtkAdjustment*) gtk_adjustment_new( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0) ); +#endif // I _really_ don't want scrollbars in the beginning m_vAdjust->lower = 0.0; @@ -1508,7 +1541,7 @@ bool wxWindow::Create( wxWindow *parent, wxWindowID id, gtk_signal_connect( GTK_OBJECT(s_window->hscrollbar), "button_release_event", (GtkSignalFunc)gtk_scrollbar_button_release_callback, (gpointer) this ); - // these handers het notified when screen updates are required either when + // these handlers get notified when screen updates are required either when // scrolling or when the window size (and therefore scrollbar configuration) // has changed @@ -1608,7 +1641,7 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - wxASSERT_MSG( (!m_needParent) || (parent), "Need complete parent." ); + wxASSERT_MSG( (!m_needParent) || (parent), _T("Need complete parent.") ); m_widget = (GtkWidget*) NULL; m_wxwindow = (GtkWidget*) NULL; @@ -1694,15 +1727,25 @@ void wxWindow::PreCreation( wxWindow *parent, wxWindowID id, void wxWindow::PostCreation() { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid window") ); if (m_wxwindow) { + /* these get reported to wxWindows -> wxPaintEvent */ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); + +#if (GTK_MINOR_VERSION > 0) + /* 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 ); + + gtk_signal_connect( GTK_OBJECT(m_widget), "draw", + GTK_SIGNAL_FUNC(gtk_window_own_draw_callback), (gpointer)this ); +#endif } ConnectWidget( GetConnectWidget() ); @@ -1754,7 +1797,7 @@ bool wxWindow::HasVMT() bool wxWindow::Close( bool force ) { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid window") ); wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); event.SetEventObject(this); @@ -1767,7 +1810,7 @@ bool wxWindow::Close( bool force ) bool wxWindow::Destroy() { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid window") ); m_hasVMT = FALSE; delete this; @@ -1794,25 +1837,10 @@ void wxWindow::PrepareDC( wxDC &WXUNUSED(dc) ) // are we to set fonts here ? } -wxPoint wxWindow::GetClientAreaOrigin() const -{ - return wxPoint(0,0); -} - -void wxWindow::AdjustForParentClientOrigin( int& x, int& y, int sizeFlags ) -{ - if (((sizeFlags & wxSIZE_NO_ADJUSTMENTS) == 0) && GetParent()) - { - wxPoint pt(GetParent()->GetClientAreaOrigin()); - x += pt.x; - y += pt.y; - } -} - void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) { - wxASSERT_MSG( (m_widget != NULL), "invalid window" ); - wxASSERT_MSG( (m_parent != NULL), "wxWindow::SetSize requires parent.\n" ); + wxASSERT_MSG( (m_widget != NULL), _T("invalid window") ); + wxASSERT_MSG( (m_parent != NULL), _T("wxWindow::SetSize requires parent.\n") ); if (m_resizing) return; /* I don't like recursions */ m_resizing = TRUE; @@ -1865,15 +1893,13 @@ void wxWindow::DoSetSize( int x, int y, int width, int height, int sizeFlags ) /* the default button has a border around it */ int border = 5; - wxPoint pt( m_parent->GetClientAreaOrigin() ); - gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x-border, m_y+pt.y-border ); + gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x-border, m_y-border ); gtk_widget_set_usize( m_widget, m_width+2*border, m_height+2*border ); } else { - wxPoint pt( m_parent->GetClientAreaOrigin() ); - gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y ); + gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y ); if ((old_width != m_width) || (old_height != m_height)) gtk_widget_set_usize( m_widget, m_width, m_height ); @@ -1896,7 +1922,7 @@ void wxWindow::OnInternalIdle() void wxWindow::GetSize( int *width, int *height ) const { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (width) (*width) = m_width; if (height) (*height) = m_height; @@ -1904,7 +1930,7 @@ void wxWindow::GetSize( int *width, int *height ) const void wxWindow::DoSetClientSize( int width, int height ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (!m_wxwindow) { @@ -1931,44 +1957,45 @@ void wxWindow::DoSetClientSize( int width, int height ) GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); -#ifdef NEW_GTK_SCROLL_CODE - GtkWidget *viewport = scroll_window->child; -#else +#if (GTK_MINOR_VERSION == 0) GtkWidget *viewport = scroll_window->viewport; -#endif - GtkStyleClass *viewport_class = viewport->style->klass; - GtkWidget *hscrollbar = scroll_window->hscrollbar; - GtkWidget *vscrollbar = scroll_window->vscrollbar; - if ((m_windowStyle & wxRAISED_BORDER) || (m_windowStyle & wxSUNKEN_BORDER)) { dw += 2 * viewport_class->xthickness; dh += 2 * viewport_class->ythickness; } +#endif + +/* + GtkWidget *hscrollbar = scroll_window->hscrollbar; + GtkWidget *vscrollbar = scroll_window->vscrollbar; + + we use this instead: range.slider_width = 11 + 2*2pts edge +*/ if (scroll_window->vscrollbar_visible) { - dw += vscrollbar->allocation.width; + dw += 15; /* dw += vscrollbar->allocation.width; */ dw += scroll_class->scrollbar_spacing; } if (scroll_window->hscrollbar_visible) { - dh += hscrollbar->allocation.height; + dh += 15; /* dh += hscrollbar->allocation.height; */ dw += scroll_class->scrollbar_spacing; } } - SetSize( width+dw, height+dh ); + SetSize( width+dw, height+dh ); } } void wxWindow::GetClientSize( int *width, int *height ) const { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (!m_wxwindow) { @@ -1996,12 +2023,8 @@ void wxWindow::GetClientSize( int *width, int *height ) const GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget); GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass ); -#ifdef NEW_GTK_SCROLL_CODE - GtkWidget *viewport = scroll_window->child; -#else +#if (GTK_MINOR_VERSION == 0) GtkWidget *viewport = scroll_window->viewport; -#endif - GtkStyleClass *viewport_class = viewport->style->klass; if ((m_windowStyle & wxRAISED_BORDER) || @@ -2010,18 +2033,23 @@ void wxWindow::GetClientSize( int *width, int *height ) const dw += 2 * viewport_class->xthickness; dh += 2 * viewport_class->ythickness; } +#endif +/* + GtkWidget *hscrollbar = scroll_window->hscrollbar; + GtkWidget *vscrollbar = scroll_window->vscrollbar; + + we use this instead: range.slider_width = 11 + 2*2pts edge +*/ if (scroll_window->vscrollbar_visible) { -// dw += vscrollbar->allocation.width; - dw += 15; // range.slider_width = 11 + 2*2pts edge + dw += 15; /* dw += vscrollbar->allocation.width; */ dw += scroll_class->scrollbar_spacing; } if (scroll_window->hscrollbar_visible) { -// dh += hscrollbar->allocation.height; - dh += 15; + dh += 15; /* dh += hscrollbar->allocation.height; */ dh += scroll_class->scrollbar_spacing; } } @@ -2033,7 +2061,7 @@ void wxWindow::GetClientSize( int *width, int *height ) const void wxWindow::GetPosition( int *x, int *y ) const { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (x) (*x) = m_x; if (y) (*y) = m_y; @@ -2041,7 +2069,7 @@ void wxWindow::GetPosition( int *x, int *y ) const void wxWindow::ClientToScreen( int *x, int *y ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); GdkWindow *source = (GdkWindow *) NULL; if (m_wxwindow) @@ -2062,17 +2090,13 @@ void wxWindow::ClientToScreen( int *x, int *y ) } } - wxPoint pt(GetClientAreaOrigin()); - org_x += pt.x; - org_y += pt.y; - if (x) *x += org_x; if (y) *y += org_y; } void wxWindow::ScreenToClient( int *x, int *y ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); GdkWindow *source = (GdkWindow *) NULL; if (m_wxwindow) @@ -2093,17 +2117,13 @@ void wxWindow::ScreenToClient( int *x, int *y ) } } - wxPoint pt(GetClientAreaOrigin()); - org_x -= pt.x; - org_y -= pt.y; - if (x) *x -= org_x; if (y) *y -= org_y; } void wxWindow::Centre( int direction ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); int x = m_x; int y = m_y; @@ -2127,7 +2147,7 @@ void wxWindow::Centre( int direction ) void wxWindow::Fit() { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); int maxX = 0; int maxY = 0; @@ -2149,7 +2169,7 @@ void wxWindow::Fit() void wxWindow::SetSizeHints( int minW, int minH, int maxW, int maxH, int WXUNUSED(incW), int WXUNUSED(incH) ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); m_minWidth = minW; m_minHeight = minH; @@ -2164,7 +2184,7 @@ void wxWindow::OnSize( wxSizeEvent &WXUNUSED(event) ) bool wxWindow::Show( bool show ) { - wxCHECK_MSG( (m_widget != NULL), FALSE, "invalid window" ); + wxCHECK_MSG( (m_widget != NULL), FALSE, _T("invalid window") ); if (show == m_isShown) return TRUE; @@ -2180,7 +2200,7 @@ bool wxWindow::Show( bool show ) void wxWindow::Enable( bool enable ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); m_isEnabled = enable; @@ -2190,9 +2210,9 @@ void wxWindow::Enable( bool enable ) int wxWindow::GetCharHeight() const { - wxCHECK_MSG( (m_widget != NULL), 12, "invalid window" ); + wxCHECK_MSG( (m_widget != NULL), 12, _T("invalid window") ); - wxCHECK_MSG( m_font.Ok(), 12, "invalid font" ); + wxCHECK_MSG( m_font.Ok(), 12, _T("invalid font") ); GdkFont *font = m_font.GetInternalFont( 1.0 ); @@ -2201,9 +2221,9 @@ int wxWindow::GetCharHeight() const int wxWindow::GetCharWidth() const { - wxCHECK_MSG( (m_widget != NULL), 8, "invalid window" ); + wxCHECK_MSG( (m_widget != NULL), 8, _T("invalid window") ); - wxCHECK_MSG( m_font.Ok(), 8, "invalid font" ); + wxCHECK_MSG( m_font.Ok(), 8, _T("invalid font") ); GdkFont *font = m_font.GetInternalFont( 1.0 ); @@ -2216,10 +2236,10 @@ void wxWindow::GetTextExtent( const wxString& string, int *x, int *y, wxFont fontToUse = m_font; if (theFont) fontToUse = *theFont; - wxCHECK_RET( fontToUse.Ok(), "invalid font" ); + wxCHECK_RET( fontToUse.Ok(), _T("invalid font") ); GdkFont *font = fontToUse.GetInternalFont( 1.0 ); - if (x) (*x) = gdk_string_width( font, string ); + if (x) (*x) = gdk_string_width( font, string.mbc_str() ); if (y) (*y) = font->ascent + font->descent; if (descent) (*descent) = font->descent; if (externalLeading) (*externalLeading) = 0; // ?? @@ -2255,7 +2275,7 @@ void wxWindow::OnKeyDown( wxKeyEvent &event ) void wxWindow::SetFocus() { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); GtkWidget *connect_widget = GetConnectWidget(); if (connect_widget) @@ -2286,15 +2306,15 @@ bool wxWindow::AcceptsFocus() const void wxWindow::AddChild( wxWindow *child ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); - wxCHECK_RET( (child != NULL), "invalid child" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); + wxCHECK_RET( (child != NULL), _T("invalid child") ); m_children.Append( child ); } wxWindow *wxWindow::ReParent( wxWindow *newParent ) { - wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, "invalid window" ); + wxCHECK_MSG( (m_widget != NULL), (wxWindow*) NULL, _T("invalid window") ); wxWindow *oldParent = GetParent(); @@ -2329,14 +2349,14 @@ int wxWindow::GetReturnCode() void wxWindow::Raise() { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (m_widget) gdk_window_raise( m_widget->window ); } void wxWindow::Lower() { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (m_widget) gdk_window_lower( m_widget->window ); } @@ -2427,7 +2447,7 @@ wxWindowID wxWindow::GetId() const void wxWindow::SetCursor( const wxCursor &cursor ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (cursor.Ok()) { @@ -2453,7 +2473,7 @@ void wxWindow::WarpPointer( int WXUNUSED(x), int WXUNUSED(y) ) void wxWindow::Refresh( bool eraseBackground, const wxRect *rect ) { - wxCHECK_RET( (m_widget != NULL), "invalid window" ); + wxCHECK_RET( (m_widget != NULL), _T("invalid window") ); if (eraseBackground && m_wxwindow && m_wxwindow->window) { @@ -2518,7 +2538,7 @@ bool wxWindow::IsExposed( const wxRect& rect ) const void wxWindow::Clear() { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); if (m_wxwindow && m_wxwindow->window) { @@ -2556,9 +2576,9 @@ void wxWindow::SetToolTip( wxToolTip *tip ) m_toolTip->Apply( this ); } -void wxWindow::ApplyToolTip( GtkTooltips *tips, const char *tip ) +void wxWindow::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - gtk_tooltips_set_tip( tips, GetConnectWidget(), tip, (gchar*) NULL ); + gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConv_current->cWX2MB(tip), (gchar*) NULL ); } #endif // wxUSE_TOOLTIPS @@ -2569,7 +2589,7 @@ wxColour wxWindow::GetBackgroundColour() const void wxWindow::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); if (m_backgroundColour == colour) return; @@ -2609,7 +2629,7 @@ wxColour wxWindow::GetForegroundColour() const void wxWindow::SetForegroundColour( const wxColour &colour ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); if (m_foregroundColour == colour) return; @@ -2677,7 +2697,7 @@ void wxWindow::ApplyWidgetStyle() bool wxWindow::Validate() { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") ); wxNode *node = m_children.First(); while (node) @@ -2694,7 +2714,7 @@ bool wxWindow::Validate() bool wxWindow::TransferDataToWindow() { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") ); wxNode *node = m_children.First(); while (node) @@ -2713,7 +2733,7 @@ bool wxWindow::TransferDataToWindow() bool wxWindow::TransferDataFromWindow() { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") ); wxNode *node = m_children.First(); while (node) @@ -2740,7 +2760,7 @@ void wxWindow::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) void wxWindow::InitDialog() { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); wxInitDialogEvent event(GetId()); event.SetEventObject( this ); @@ -2774,9 +2794,9 @@ static void pop_pos_callback( GtkMenu *menu, gint *x, gint *y, wxWindow *win ) bool wxWindow::PopupMenu( wxMenu *menu, int x, int y ) { - wxCHECK_MSG( m_widget != NULL, FALSE, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, FALSE, _T("invalid window") ); - wxCHECK_MSG( menu != NULL, FALSE, "invalid popup-menu" ); + wxCHECK_MSG( menu != NULL, FALSE, _T("invalid popup-menu") ); SetInvokingWindow( menu, this ); @@ -2801,7 +2821,7 @@ bool wxWindow::PopupMenu( wxMenu *menu, int x, int y ) void wxWindow::SetDropTarget( wxDropTarget *dropTarget ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); GtkWidget *dnd_widget = GetConnectWidget(); @@ -2836,7 +2856,7 @@ bool wxWindow::IsOwnGtkWindow( GdkWindow *window ) void wxWindow::SetFont( const wxFont &font ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); if (m_font == font) return; @@ -2872,9 +2892,9 @@ long wxWindow::GetWindowStyleFlag() const void wxWindow::CaptureMouse() { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); - wxCHECK_RET( g_capturing == FALSE, "CaptureMouse called twice" ); + wxCHECK_RET( g_capturing == FALSE, _T("CaptureMouse called twice") ); GtkWidget *connect_widget = GetConnectWidget(); gtk_grab_add( connect_widget ); @@ -2891,9 +2911,9 @@ void wxWindow::CaptureMouse() void wxWindow::ReleaseMouse() { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); - wxCHECK_RET( g_capturing == TRUE, "ReleaseMouse called twice" ); + wxCHECK_RET( g_capturing == TRUE, _T("ReleaseMouse called twice") ); GtkWidget *connect_widget = GetConnectWidget(); gtk_grab_remove( connect_widget ); @@ -2966,9 +2986,9 @@ wxWindow *wxWindow::FindWindow( const wxString& name ) void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible, int range, bool refresh ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); - wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" ); + wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") ); m_hasScrolling = TRUE; @@ -3034,9 +3054,9 @@ void wxWindow::SetScrollbar( int orient, int pos, int thumbVisible, void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); - wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" ); + wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") ); if (orient == wxHORIZONTAL) { @@ -3073,9 +3093,9 @@ void wxWindow::SetScrollPos( int orient, int pos, bool WXUNUSED(refresh) ) int wxWindow::GetScrollThumb( int orient ) const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" ); + wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") ); if (orient == wxHORIZONTAL) return (int)(m_hAdjust->page_size+0.5); @@ -3085,9 +3105,9 @@ int wxWindow::GetScrollThumb( int orient ) const int wxWindow::GetScrollPos( int orient ) const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" ); + wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") ); if (orient == wxHORIZONTAL) return (int)(m_hAdjust->value+0.5); @@ -3097,9 +3117,9 @@ int wxWindow::GetScrollPos( int orient ) const int wxWindow::GetScrollRange( int orient ) const { - wxCHECK_MSG( m_widget != NULL, 0, "invalid window" ); + wxCHECK_MSG( m_widget != NULL, 0, _T("invalid window") ); - wxCHECK_MSG( m_wxwindow != NULL, 0, "window needs client area for scrolling" ); + wxCHECK_MSG( m_wxwindow != NULL, 0, _T("window needs client area for scrolling") ); if (orient == wxHORIZONTAL) return (int)(m_hAdjust->upper+0.5); @@ -3109,9 +3129,17 @@ int wxWindow::GetScrollRange( int orient ) const void wxWindow::ScrollWindow( int dx, int dy, const wxRect* WXUNUSED(rect) ) { - wxCHECK_RET( m_widget != NULL, "invalid window" ); + wxCHECK_RET( m_widget != NULL, _T("invalid window") ); + + wxCHECK_RET( m_wxwindow != NULL, _T("window needs client area for scrolling") ); - wxCHECK_RET( m_wxwindow != NULL, "window needs client area for scrolling" ); + wxNode *node = m_children.First(); + while (node) + { + wxWindow *child = (wxWindow*) node->Data(); + child->Move( child->m_x + dx, child->m_y + dy ); + node = node->Next(); + } int cw = 0; int ch = 0; @@ -3454,21 +3482,21 @@ void wxWindow::SetConstraintSizes(bool recurse) } else if (constr) { - char *windowClass = this->GetClassInfo()->GetClassName(); + wxChar *windowClass = this->GetClassInfo()->GetClassName(); wxString winName; - if (GetName() == "") - winName = "unnamed"; + if (GetName() == _T("")) + winName = _T("unnamed"); else winName = GetName(); - 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" ); - if (!constr->height.GetDone()) wxLogDebug( " unsatisfied 'height' constraint.\n" ); - wxLogDebug( "Please check constraints: try adding AsIs() constraints.\n" ); + wxLogDebug( _T("Constraint(s) not satisfied for window of type %s, name %s:\n"), + (const wxChar *)windowClass, + (const wxChar *)winName); + if (!constr->left.GetDone()) wxLogDebug( _T(" unsatisfied 'left' constraint.\n") ); + if (!constr->right.GetDone()) wxLogDebug( _T(" unsatisfied 'right' constraint.\n") ); + if (!constr->width.GetDone()) wxLogDebug( _T(" unsatisfied 'width' constraint.\n") ); + if (!constr->height.GetDone()) wxLogDebug( _T(" unsatisfied 'height' constraint.\n") ); + wxLogDebug( _T("Please check constraints: try adding AsIs() constraints.\n") ); } if (recurse)