X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1f50e652c0e105c0ed8ab627be837c45f7a1a00..86b79b93fbbb0c2e90e6595f7fea0f979b80881c:/src/gtk/window.cpp diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 3a43a9e18a..e5144820ee 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -1365,6 +1365,7 @@ static gint gtk_window_key_release_callback( GtkWidget *widget, event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK); \ if (event.GetEventType()==wxEVT_MOUSEWHEEL) \ { \ + event.m_linesPerAction = 3; \ if (((GdkEventButton*)gdk_event)->button == 4) \ event.m_wheelRotation = 120; \ else if (((GdkEventButton*)gdk_event)->button == 5) \ @@ -1537,6 +1538,20 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, wxEventType event_type = wxEVT_NULL; + // GdkDisplay is a GTK+ 2.1.0 thing +#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 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 @@ -1544,6 +1559,10 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, // clicks would simply go missing switch (gdk_event->type) { + // we shouldn't get triple clicks at all for GTK2 because we + // suppress them artificially using the code above but we still + // should map them to something for GTK1 and not just ignore them + // as this would lose clicks case GDK_3BUTTON_PRESS: // we could also map this to DCLICK... case GDK_BUTTON_PRESS: event_type = wxEVT_LEFT_DOWN; @@ -1562,6 +1581,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, { switch (gdk_event->type) { + case GDK_3BUTTON_PRESS: case GDK_BUTTON_PRESS: event_type = wxEVT_MIDDLE_DOWN; break; @@ -1578,6 +1598,7 @@ static gint gtk_window_button_press_callback( GtkWidget *widget, { switch (gdk_event->type) { + case GDK_3BUTTON_PRESS: case GDK_BUTTON_PRESS: event_type = wxEVT_RIGHT_DOWN; break; @@ -1831,6 +1852,7 @@ static gint gtk_window_wheel_callback (GtkWidget * widget, 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; if (gdk_event->direction == GDK_SCROLL_UP) event.m_wheelRotation = 120; else @@ -2710,8 +2732,6 @@ bool wxWindowGTK::Create( wxWindow *parent, PostCreation(); - Show( TRUE ); - return TRUE; } @@ -2770,10 +2790,8 @@ bool wxWindowGTK::PreCreation( wxWindowGTK *parent, const wxPoint &pos, const w { wxCHECK_MSG( !m_needParent || parent, FALSE, wxT("Need complete parent.") ); - // This turns -1 into 30 so that a minimal window is - // visible even although -1,-1 has been given as the - // size of the window. the same trick is used in other - // ports and should make debugging easier. + // Use either the given size, or the default if -1 is given. + // See wxWindowBase for these functions. m_width = WidthDefault(size.x) ; m_height = HeightDefault(size.y); @@ -2898,6 +2916,11 @@ void wxWindowGTK::PostCreation() } 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 + if ( IsShown() ) + gtk_widget_show( m_widget ); } void wxWindowGTK::ConnectWidget( GtkWidget *widget ) @@ -2984,18 +3007,22 @@ void wxWindowGTK::DoSetSize( int x, int y, int width, int height, int sizeFlags m_x = x + pizza->xoffset; m_y = y + pizza->yoffset; } - if (width != -1) m_width = width; - if (height != -1) m_height = height; - if ((sizeFlags & wxSIZE_AUTO_WIDTH) == wxSIZE_AUTO_WIDTH) + // calculate the best size if we should auto size the window + if ( ((sizeFlags & wxSIZE_AUTO_WIDTH) && width == -1) || + ((sizeFlags & wxSIZE_AUTO_HEIGHT) && height == -1) ) { - if (width == -1) m_width = 80; + const wxSize sizeBest = GetBestSize(); + if ( (sizeFlags & wxSIZE_AUTO_WIDTH) && width == -1 ) + width = sizeBest.x; + if ( (sizeFlags & wxSIZE_AUTO_HEIGHT) && height == -1 ) + height = sizeBest.y; } - if ((sizeFlags & wxSIZE_AUTO_HEIGHT) == wxSIZE_AUTO_HEIGHT) - { - if (height == -1) m_height = 26; - } + if (width != -1) + m_width = width; + if (height != -1) + m_height = height; int minWidth = GetMinWidth(), minHeight = GetMinHeight(), @@ -3401,7 +3428,8 @@ int wxWindowGTK::GetCharHeight() const { wxCHECK_MSG( (m_widget != NULL), 12, wxT("invalid window") ); - wxCHECK_MSG( m_font.Ok(), 12, wxT("invalid font") ); + wxFont font = GetFont(); + wxCHECK_MSG( font.Ok(), 12, wxT("invalid font") ); #ifdef __WXGTK20__ PangoContext *context = NULL; @@ -3411,7 +3439,7 @@ int wxWindowGTK::GetCharHeight() const if (!context) return 0; - PangoFontDescription *desc = m_font.GetNativeFontInfo()->description; + 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); @@ -3424,9 +3452,9 @@ int wxWindowGTK::GetCharHeight() const return (int) (rect.height / PANGO_SCALE); #else - GdkFont *font = m_font.GetInternalFont( 1.0 ); + GdkFont *gfont = font.GetInternalFont( 1.0 ); - return font->ascent + font->descent; + return gfont->ascent + gfont->descent; #endif } @@ -3434,7 +3462,8 @@ int wxWindowGTK::GetCharWidth() const { wxCHECK_MSG( (m_widget != NULL), 8, wxT("invalid window") ); - wxCHECK_MSG( m_font.Ok(), 8, wxT("invalid font") ); + wxFont font = GetFont(); + wxCHECK_MSG( font.Ok(), 8, wxT("invalid font") ); #ifdef __WXGTK20__ PangoContext *context = NULL; @@ -3444,7 +3473,7 @@ int wxWindowGTK::GetCharWidth() const if (!context) return 0; - PangoFontDescription *desc = m_font.GetNativeFontInfo()->description; + 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); @@ -3457,9 +3486,9 @@ int wxWindowGTK::GetCharWidth() const return (int) (rect.width / PANGO_SCALE); #else - GdkFont *font = m_font.GetInternalFont( 1.0 ); + GdkFont *gfont = font.GetInternalFont( 1.0 ); - return gdk_string_width( font, "g" ); + return gdk_string_width( gfont, "g" ); #endif } @@ -3470,8 +3499,7 @@ void wxWindowGTK::GetTextExtent( const wxString& string, int *externalLeading, const wxFont *theFont ) const { - wxFont fontToUse = m_font; - if (theFont) fontToUse = *theFont; + wxFont fontToUse = theFont ? *theFont : GetFont(); wxCHECK_RET( fontToUse.Ok(), wxT("invalid font") ); @@ -3975,7 +4003,8 @@ void wxWindowGTK::DoSetToolTip( wxToolTip *tip ) void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) { - gtk_tooltips_set_tip( tips, GetConnectWidget(), wxConvCurrent->cWX2MB(tip), (gchar*) NULL ); + wxString tmp( tip ); + gtk_tooltips_set_tip( tips, GetConnectWidget(), wxGTK_CONV(tmp), (gchar*) NULL ); } #endif // wxUSE_TOOLTIPS @@ -4140,7 +4169,7 @@ void wxWindowGTK::SetWidgetStyle() GtkStyle *style = GetWidgetStyle(); - if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT )) + if ( m_hasFont ) { #ifdef __WXGTK20__ pango_font_description_free( style->font_desc ); @@ -4151,7 +4180,7 @@ void wxWindowGTK::SetWidgetStyle() #endif } - if (m_foregroundColour.Ok()) + if ( m_hasFgCol ) { m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)) @@ -4177,7 +4206,7 @@ void wxWindowGTK::SetWidgetStyle() } } - if (m_backgroundColour.Ok()) + if ( m_hasBgCol ) { m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))