X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..1c60f644581df7bfc4b44d9ad68ee94ff728ceb5:/src/gtk/control.cpp diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index 21e35fd0d2..b79878875b 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -21,6 +21,10 @@ #include "wx/fontutil.h" #include "wx/gtk/private.h" +#include "wx/utils.h" +#include "wx/sysopt.h" + +#include "wx/gtk/private/mnemonics.h" // ============================================================================ // wxControl implementation @@ -34,7 +38,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { - m_needParent = true; } bool wxControl::Create( wxWindow *parent, @@ -59,13 +62,18 @@ 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; + GTK_WIDGET_GET_CLASS(m_widget)->size_request(m_widget, &req); + best.Set(req.width, req.height); + } CacheBestSize(best); return best; } @@ -81,38 +89,54 @@ void wxControl::PostCreation(const wxSize& size) // GetBestSize is called. gtk_widget_ensure_style(m_widget); - ApplyWidgetStyle(); - SetInitialBestSize(size); + GTKApplyWidgetStyle(); + SetInitialSize(size); } // ---------------------------------------------------------------------------- -// wxControl dealing with labels +// Work around a GTK+ bug whereby button is insensitive after being +// enabled // ---------------------------------------------------------------------------- -void wxControl::SetLabel( const wxString &label ) +// Fix sensitivity due to bug in GTK+ < 2.14 +void wxControl::GTKFixSensitivity(bool onlyIfUnderMouse) { - // keep the original string internally to be able to return it later (for - // consistency with the other ports) - m_label = label; - - InvalidateBestSize(); + 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(); + } + } } -wxString wxControl::GetLabel() const -{ - return m_label; -} +// ---------------------------------------------------------------------------- +// wxControl dealing with labels +// ---------------------------------------------------------------------------- void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) { - // don't call the virtual function which might call this one back again - wxControl::SetLabel(label); + // save the original label + wxControlBase::SetLabel(label); const wxString labelGTK = GTKConvertMnemonics(label); - gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) +{ + const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); + gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); +} + + // ---------------------------------------------------------------------------- // GtkFrame helpers // @@ -130,8 +154,8 @@ GtkWidget* wxControl::GTKCreateFrame(const wxString& label) GtkWidget* framewidget = gtk_frame_new(NULL); gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget); - return framewidget; //note that the label is already set so you'll - //only need to call wxControl::SetLabel afterwards + return framewidget; // note that the label is already set so you'll + // only need to call wxControl::SetLabel afterwards } void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) @@ -154,92 +178,25 @@ void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) } // ---------------------------------------------------------------------------- -// worker function implementing both GTKConvert/RemoveMnemonics() -// -// notice that under GTK+ 1 we only really need to support MNEMONICS_REMOVE as -// it doesn't support mnemonics anyhow but this would make the code so ugly -// that we do the same thing for GKT+ 1 and 2 +// worker function implementing GTK*Mnemonics() functions // ---------------------------------------------------------------------------- -enum MnemonicsFlag -{ - MNEMONICS_REMOVE, - MNEMONICS_CONVERT -}; - -static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag) +/* static */ +wxString wxControl::GTKRemoveMnemonics(const wxString& label) { - const size_t len = label.length(); - wxString labelGTK; - labelGTK.reserve(len); - for ( size_t i = 0; i < len; i++ ) - { - wxChar ch = label[i]; - - switch ( ch ) - { - case wxT('&'): - if ( i == len - 1 ) - { - // "&" at the end of string is an error - wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str()); - break; - } - - ch = label[++i]; // skip '&' itself - switch ( ch ) - { - case wxT('&'): - // special case: "&&" is not a mnemonic at all but just - // an escaped "&" - labelGTK += wxT('&'); - break; - - case wxT('_'): - if ( flag == MNEMONICS_CONVERT ) - { - // '_' can't be a GTK mnemonic apparently so - // replace it with something similar - labelGTK += wxT("_-"); - break; - } - //else: fall through - - default: - if ( flag == MNEMONICS_CONVERT ) - labelGTK += wxT('_'); - labelGTK += ch; - } - break; - - case wxT('_'): - if ( flag == MNEMONICS_CONVERT ) - { - // escape any existing underlines in the string so that - // they don't become mnemonics accidentally - labelGTK += wxT("__"); - break; - } - //else: fall through - - default: - labelGTK += ch; - } - } - - return labelGTK; + return wxGTKRemoveMnemonics(label); } /* static */ -wxString wxControl::GTKRemoveMnemonics(const wxString& label) +wxString wxControl::GTKConvertMnemonics(const wxString& label) { - return GTKProcessMnemonics(label, MNEMONICS_REMOVE); + return wxConvertMnemonicsToGTK(label); } /* static */ -wxString wxControl::GTKConvertMnemonics(const wxString& label) +wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label) { - return GTKProcessMnemonics(label, MNEMONICS_CONVERT); + return wxConvertMnemonicsToGTKMarkup(label); } // ---------------------------------------------------------------------------- @@ -252,9 +209,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const UseGTKStyleBase()); } - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - // static wxVisualAttributes wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, @@ -277,17 +231,11 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, state = GTK_STATE_NORMAL; // get the style's colours - attr.colFg = wxColour(style->fg[state].red >> SHIFT, - style->fg[state].green >> SHIFT, - style->fg[state].blue >> SHIFT); + attr.colFg = wxColour(style->fg[state]); if (useBase) - attr.colBg = wxColour(style->base[state].red >> SHIFT, - style->base[state].green >> SHIFT, - style->base[state].blue >> SHIFT); + attr.colBg = wxColour(style->base[state]); else - attr.colBg = wxColour(style->bg[state].red >> SHIFT, - style->bg[state].green >> SHIFT, - style->bg[state].blue >> SHIFT); + attr.colBg = wxColour(style->bg[state]); // get the style's font if ( !style->font_desc ) @@ -372,12 +320,15 @@ wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new, void wxControl::OnInternalIdle() { - if ( GtkShowFromOnIdle() ) + if ( GTKShowFromOnIdle() ) return; - - GTKUpdateCursor(); - if ( wxUpdateUIEvent::CanUpdate(this) ) + if ( GTK_WIDGET_REALIZED(m_widget) ) + { + GTKUpdateCursor(); + } + + if ( wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen() ) UpdateWindowUI(wxUPDATE_UI_FROMIDLE); }