X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe161a2685012cf90bb5bfe95f2260aee71d8ad7..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/gtk/control.cpp?ds=inline diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index ed8b2147e8..5a06a3910f 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -1,39 +1,43 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp -// Purpose: +// Name: src/gtk/control.cpp +// Purpose: wxControl implementation for wxGTK // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling, Julian Smart and Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "control.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/defs.h" - #if wxUSE_CONTROLS #include "wx/control.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/settings.h" +#endif + #include "wx/fontutil.h" -#include "wx/settings.h" +#include "wx/gtk/private.h" +#include "wx/utils.h" +#include "wx/sysopt.h" -#include +#include "wx/gtk/private/mnemonics.h" -//----------------------------------------------------------------------------- -// wxControl -//----------------------------------------------------------------------------- +// ============================================================================ +// wxControl implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// wxControl creation +// ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { - m_needParent = TRUE; - m_createComplete = false; } bool wxControl::Create( wxWindow *parent, @@ -44,9 +48,8 @@ bool wxControl::Create( wxWindow *parent, const wxValidator& validator, const wxString &name ) { - m_createComplete = false; bool ret = wxWindow::Create(parent, id, pos, size, style, name); - + #if wxUSE_VALIDATORS SetValidator(validator); #endif @@ -54,113 +57,153 @@ bool wxControl::Create( wxWindow *parent, return ret; } -void wxControl::SetLabel( const wxString &label ) +wxSize wxControl::DoGetBestSize() const { - m_label.Empty(); - for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ ) + // Do not return any arbitrary default value... + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); + + wxSize best; + if (m_wxwindow) { - if ( *pc == wxT('&') ) - { - pc++; // skip it -#if 0 // it would be unused anyhow for now - kbd interface not done yet - if ( *pc != wxT('&') ) m_chAccel = *pc; + // 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; +} + +void wxControl::PostCreation(const wxSize& size) +{ + wxWindow::PostCreation(); + + // 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); + + 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 onlyIfUnderMouse) +{ + 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(); } - m_label << *pc; } } -void wxControl::PostSetLabel() +// ---------------------------------------------------------------------------- +// wxControl dealing with labels +// ---------------------------------------------------------------------------- + +void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label) { - // make sure the widget has been created, and that PostCreate has already - // been called - if (m_widget && m_createComplete && GetAdjustMinSizeFlag()) - SetBestSize(wxDefaultSize); + const wxString labelGTK = GTKConvertMnemonics(label); + gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK)); } -wxString wxControl::GetLabel() const +#if wxUSE_MARKUP + +void wxControl::GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label) { - return m_label; + const wxString labelGTK = GTKConvertMnemonicsWithMarkup(label); + gtk_label_set_markup_with_mnemonic(w, wxGTK_CONV(labelGTK)); } +#endif // wxUSE_MARKUP -wxSize wxControl::DoGetBestSize() const +// ---------------------------------------------------------------------------- +// GtkFrame helpers +// +// GtkFrames do in fact support mnemonics in GTK2+ but not through +// gtk_frame_set_label, rather you need to use a custom label widget +// instead (idea gleaned from the native gtk font dialog code in GTK) +// ---------------------------------------------------------------------------- + +GtkWidget* wxControl::GTKCreateFrame(const wxString& label) { - // Do not return any arbitrary default value... - wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); + const wxString labelGTK = GTKConvertMnemonics(label); + GtkWidget* labelwidget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK)); + gtk_widget_show(labelwidget); // without this it won't show... - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); + GtkWidget* framewidget = gtk_frame_new(NULL); + gtk_frame_set_label_widget(GTK_FRAME(framewidget), labelwidget); - return wxSize(req.width, req.height); + 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) +{ + wxControlBase::SetLabel(label); -void wxControl::PostCreation(const wxSize& size) + GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); + GTKSetLabelForLabel(labelwidget, label); +} + +void wxControl::GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* style) { - wxWindow::PostCreation(); + gtk_widget_modify_style(GTK_WIDGET(w), style); + gtk_widget_modify_style(gtk_frame_get_label_widget (w), style); +} - // 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); - - InheritAttributes(); - ApplyWidgetStyle(); - SetInitialBestSize(size); - m_createComplete = true; +void wxControl::GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget) +{ + GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w)); + + gtk_label_set_mnemonic_widget(labelwidget, widget); } +// ---------------------------------------------------------------------------- +// worker function implementing GTK*Mnemonics() functions +// ---------------------------------------------------------------------------- -#ifdef __WXGTK20__ -wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const +/* static */ +wxString wxControl::GTKRemoveMnemonics(const wxString& label) { - //Format mnemonics properly for GTK2. This can be called from GTK1.x, but - //it's not very useful because mnemonics don't exist prior to GTK2. - wxString label2; - for (size_t i = 0; i < label.Len(); i++) - { - if (label.GetChar(i) == wxT('&')) - { - //Mnemonic escape sequence "&&" is a literal "&" in the output. - if (label.GetChar(i + 1) == wxT('&')) - { - label2 << wxT('&'); - i++; - } - //Handle special case of "&_" (i.e. "_" is the mnemonic). - //FIXME - Is it possible to use "_" as a GTK mnemonic? Just use a - //dash for now. - else if (label.GetChar(i + 1) == wxT('_')) - { - label2 << wxT("_-"); - i++; - } - //Replace WX mnemonic indicator "&" with GTK indicator "_". - else - { - label2 << wxT('_'); - } - } - else if (label.GetChar(i) == wxT('_')) - { - //Escape any underlines in the string so GTK doesn't use them. - label2 << wxT("__"); - } - else - { - label2 << label.GetChar(i); - } - } - return label2; + return wxGTKRemoveMnemonics(label); +} + +/* static */ +wxString wxControl::GTKConvertMnemonics(const wxString& label) +{ + return wxConvertMnemonicsToGTK(label); +} + +/* static */ +wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label) +{ + return wxConvertMnemonicsToGTKMarkup(label); } -#endif +// ---------------------------------------------------------------------------- +// wxControl styles (a.k.a. attributes) +// ---------------------------------------------------------------------------- wxVisualAttributes wxControl::GetDefaultAttributes() const { @@ -168,9 +211,6 @@ wxVisualAttributes wxControl::GetDefaultAttributes() const UseGTKStyleBase()); } - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - // static wxVisualAttributes wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, @@ -191,36 +231,29 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, if (state == -1) 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 -#ifdef __WXGTK20__ if ( !style->font_desc ) - style = gtk_widget_get_default_style(); + style = gtk_widget_get_default_style(); if ( style && style->font_desc ) - { - wxNativeFontInfo info; - info.description = style->font_desc; - attr.font = wxFont(info); - } - else - { + { + wxNativeFontInfo info; + info.description = pango_font_description_copy(style->font_desc); + attr.font = wxFont(info); + } + else + { GtkSettings *settings = gtk_settings_get_default(); gchar *font_name = NULL; g_object_get ( settings, - "gtk-font-name", + "gtk-font-name", &font_name, NULL); if (!font_name) @@ -228,71 +261,59 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, else attr.font = wxFont(wxString::FromAscii(font_name)); g_free (font_name); - } -#else - // TODO: isn't there a way to get a standard gtk 1.2 font? - attr.font = wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL ); -#endif - + } + return attr; } //static wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void), +wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t widget_new, bool useBase, int state) { wxVisualAttributes attr; + // NB: we need toplevel window so that GTK+ can find the right style + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget* widget = widget_new(); + gtk_container_add(GTK_CONTAINER(wnd), widget); attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state); - gtk_widget_destroy(widget); + gtk_widget_destroy(wnd); return attr; } //static wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gchar*), +wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t widget_new, bool useBase, int state) { wxVisualAttributes attr; + // NB: we need toplevel window so that GTK+ can find the right style + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget* widget = widget_new(""); + gtk_container_add(GTK_CONTAINER(wnd), widget); attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state); - gtk_widget_destroy(widget); + gtk_widget_destroy(wnd); return attr; } //static wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*), +wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new, bool useBase, int state) { wxVisualAttributes attr; + // NB: we need toplevel window so that GTK+ can find the right style + GtkWidget *wnd = gtk_window_new(GTK_WINDOW_TOPLEVEL); GtkWidget* widget = widget_new(NULL); + gtk_container_add(GTK_CONTAINER(wnd), widget); attr = GetDefaultAttributesFromGTKWidget(widget, useBase, state); - gtk_widget_destroy(widget); + gtk_widget_destroy(wnd); return attr; } -void wxControl::ApplyWidgetStyle(bool forceStyle) -{ - GtkRcStyle *style = CreateWidgetStyle(forceStyle); - if ( style ) - { - DoApplyWidgetStyle(style); - gtk_rc_style_unref(style); - } -} - -void wxControl::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); -} - - #endif // wxUSE_CONTROLS -