X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1f17bf00ff1480a50a657674b974c40da82eda1..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index ea16fae76a..40c21e9e15 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -20,8 +20,11 @@ #endif #include "wx/fontutil.h" -#include "wx/gtk/private.h" +#include "wx/utils.h" +#include "wx/sysopt.h" +#include +#include "wx/gtk/private.h" #include "wx/gtk/private/mnemonics.h" // ============================================================================ @@ -55,18 +58,51 @@ bool wxControl::Create( wxWindow *parent, return ret; } +#ifdef __WXGTK3__ +bool wxControl::SetFont(const wxFont& font) +{ + const bool changed = base_type::SetFont(font); + if (changed && !gtk_widget_get_realized(m_widget)) + { + // GTK defers sending "style-updated" until widget is realized, but + // GetBestSize() won't compute correct result until the signal is sent, + // so we have to do it now + g_signal_emit_by_name(m_widget, "style-updated"); + } + return changed; +} +#endif + wxSize wxControl::DoGetBestSize() const { // Do not return any arbitrary default value... wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); - - wxSize best(req.width, req.height); + wxSize best; + if (m_wxwindow) + { + // this is not a native control, size_request is likely to be (0,0) + best = wxControlBase::DoGetBestSize(); + } + else + { + GtkRequisition req; +#ifdef __WXGTK3__ + if (gtk_widget_get_request_mode(m_widget) != GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH) + { + gtk_widget_get_preferred_height(m_widget, NULL, &req.height); + gtk_widget_get_preferred_width_for_height(m_widget, req.height, NULL, &req.width); + } + else + { + gtk_widget_get_preferred_width(m_widget, NULL, &req.width); + gtk_widget_get_preferred_height_for_width(m_widget, req.width, NULL, &req.height); + } +#else + GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req); +#endif + best.Set(req.width, req.height); + } CacheBestSize(best); return best; } @@ -75,36 +111,64 @@ void wxControl::PostCreation(const wxSize& size) { wxWindow::PostCreation(); +#ifndef __WXGTK3__ // NB: GetBestSize needs to know the style, otherwise it will assume // default font and if the user uses a different font, determined // best size will be different (typically, smaller) than the desired // size. This call ensure that a style is available at the time // GetBestSize is called. gtk_widget_ensure_style(m_widget); +#endif - ApplyWidgetStyle(); + GTKApplyWidgetStyle(); SetInitialSize(size); } +// ---------------------------------------------------------------------------- +// Work around a GTK+ bug whereby button is insensitive after being +// enabled +// ---------------------------------------------------------------------------- + +// Fix sensitivity due to bug in GTK+ < 2.14 +void wxControl::GTKFixSensitivity(bool WXUNUSED_IN_GTK3(onlyIfUnderMouse)) +{ +#ifndef __WXGTK3__ + if (gtk_check_version(2,14,0) +#if wxUSE_SYSTEM_OPTIONS + && (wxSystemOptions::GetOptionInt(wxT("gtk.control.disable-sensitivity-fix")) != 1) +#endif + ) + { + wxPoint pt = wxGetMousePosition(); + wxRect rect(ClientToScreen(wxPoint(0, 0)), GetSize()); + if (!onlyIfUnderMouse || rect.Contains(pt)) + { + Hide(); + Show(); + } + } +#endif +} + // ---------------------------------------------------------------------------- // wxControl dealing with labels // ---------------------------------------------------------------------------- void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) { - // save the original label - wxControlBase::SetLabel(label); - const wxString labelGTK = GTKConvertMnemonics(label); gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +#if wxUSE_MARKUP + void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) { const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +#endif // wxUSE_MARKUP // ---------------------------------------------------------------------------- // GtkFrame helpers @@ -129,14 +193,16 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label) void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) { + wxControlBase::SetLabel(label); + GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); GTKSetLabelForLabel(labelwidget, label); } void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style) { - gtk_widget_modify_style(GTK_WIDGET(w), style); - gtk_widget_modify_style(gtk_frame_get_label_widget (w), style); + GTKApplyStyle(GTK_WIDGET(w), style); + GTKApplyStyle(gtk_frame_get_label_widget(w), style); } void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) @@ -181,11 +247,29 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const // static wxVisualAttributes wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool useBase, + bool WXUNUSED_IN_GTK3(useBase), int state) { - GtkStyle* style; wxVisualAttributes attr; +#ifdef __WXGTK3__ + GtkStateFlags stateFlag = GTK_STATE_FLAG_NORMAL; + if (state) + { + wxASSERT(state == GTK_STATE_ACTIVE); + stateFlag = GTK_STATE_FLAG_ACTIVE; + } + GtkStyleContext* sc = gtk_widget_get_style_context(widget); + GdkRGBA c; + gtk_style_context_get_color(sc, stateFlag, &c); + attr.colFg = wxColour(c); + gtk_style_context_get_background_color(sc, stateFlag, &c); + attr.colBg = wxColour(c); + wxNativeFontInfo info; + info.description = const_cast(gtk_style_context_get_font(sc, stateFlag)); + attr.font = wxFont(info); + info.description = NULL; +#else + GtkStyle* style; style = gtk_rc_get_style(widget); if (!style) @@ -196,9 +280,6 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, return wxWindow::GetClassDefaultAttributes(wxWINDOW_VARIANT_NORMAL); } - if (state == -1) - state = GTK_STATE_NORMAL; - // get the style's colours attr.colFg = wxColour(style->fg[state]); if (useBase) @@ -212,10 +293,12 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, if ( style && style->font_desc ) { wxNativeFontInfo info; - info.description = pango_font_description_copy(style->font_desc); + info.description = style->font_desc; attr.font = wxFont(info); + info.description = NULL; } - else +#endif + if (!attr.font.IsOk()) { GtkSettings *settings = gtk_settings_get_default(); gchar *font_name = NULL; @@ -283,24 +366,4 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new, return attr; } -// ---------------------------------------------------------------------------- -// idle handling -// ---------------------------------------------------------------------------- - -void wxControl::OnInternalIdle() -{ - if ( GtkShowFromOnIdle() ) - return; - - if ( GTK_WIDGET_REALIZED(m_widget) ) - { - GTKUpdateCursor(); - - GTKSetDelayedFocusIfNeeded(); - } - - if ( wxUpdateUIEvent::CanUpdate(this) ) - UpdateWindowUI(wxUPDATE_UI_FROMIDLE); -} - #endif // wxUSE_CONTROLS