X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/66d8fe771232b6094f361a401f096cfac4205f9a..a5de860f0b8994b2d87d0a0d3c3dedf750fa7ddb:/src/gtk1/control.cpp diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index 06eaec261b..4e0db419e6 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -1,38 +1,40 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: control.cpp -// Purpose: +// Name: src/gtk1/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/gtk1/private.h" -#include +// ============================================================================ +// wxControl implementation +// ============================================================================ -//----------------------------------------------------------------------------- -// wxControl -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- +// wxControl creation +// ---------------------------------------------------------------------------- IMPLEMENT_DYNAMIC_CLASS(wxControl, wxWindow) wxControl::wxControl() { - m_needParent = TRUE; + m_needParent = true; } bool wxControl::Create( wxWindow *parent, @@ -44,7 +46,7 @@ bool wxControl::Create( wxWindow *parent, const wxString &name ) { bool ret = wxWindow::Create(parent, id, pos, size, style, name); - + #if wxUSE_VALIDATORS SetValidator(validator); #endif @@ -52,29 +54,6 @@ bool wxControl::Create( wxWindow *parent, return ret; } -void wxControl::SetLabel( const wxString &label ) -{ - m_label.Empty(); - for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ ) - { - 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; -#endif - } - m_label << *pc; - } - InvalidateBestSize(); -} - -wxString wxControl::GetLabel() const -{ - return m_label; -} - - wxSize wxControl::DoGetBestSize() const { // Do not return any arbitrary default value... @@ -102,56 +81,87 @@ void wxControl::PostCreation(const wxSize& size) // size. This call ensure that a style is available at the time // GetBestSize is called. gtk_widget_ensure_style(m_widget); - + ApplyWidgetStyle(); - SetInitialBestSize(size); + SetInitialSize(size); +} + +// ---------------------------------------------------------------------------- +// wxControl dealing with labels +// ---------------------------------------------------------------------------- + +void wxControl::SetLabel( const wxString &label ) +{ + // keep the original string internally to be able to return it later (for + // consistency with the other ports) + m_label = label; + + InvalidateBestSize(); } +wxString wxControl::GetLabel() const +{ + return m_label; +} -#ifdef __WXGTK20__ -wxString wxControl::PrepareLabelMnemonics( const wxString &label ) const +void wxControl::GTKSetLabelForLabel(GtkLabel *w, 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++) + // don't call the virtual function which might call this one back again + wxControl::SetLabel(label); + + const wxString labelGTK = GTKRemoveMnemonics(label); + + gtk_label_set(w, wxGTK_CONV(labelGTK)); +} + +void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label) +{ + wxControl::SetLabel(label); + + const wxString labelGTK = GTKRemoveMnemonics(label); + + gtk_frame_set_label(w, labelGTK.empty() ? (const char *)NULL + : wxGTK_CONV(labelGTK)); +} + +/* 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++ ) { - if (label.GetChar(i) == wxT('&')) + wxChar ch = label[i]; + + if ( ch == _T('&') ) { - //Mnemonic escape sequence "&&" is a literal "&" in the output. - if (label.GetChar(i + 1) == wxT('&')) + if ( i == len - 1 ) { - label2 << wxT('&'); - i++; + // "&" at the end of string is an error + wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str()); + break; } - //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 + + ch = label[++i]; // skip '&' itself + if ( ch == _T('&') ) { - label2 << wxT('_'); + // special case: "&&" is not a mnemonic at all but just an + // escaped "&" + labelGTK += wxT('&'); + continue; } } - 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); - } + + labelGTK += ch; } - return label2; + + return labelGTK; } -#endif +// ---------------------------------------------------------------------------- +// wxControl styles (a.k.a. attributes) +// ---------------------------------------------------------------------------- wxVisualAttributes wxControl::GetDefaultAttributes() const { @@ -182,7 +192,7 @@ 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, @@ -197,41 +207,16 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* widget, style->bg[state].blue >> SHIFT); // get the style's font -#ifdef __WXGTK20__ - if ( !style->font_desc ) - style = gtk_widget_get_default_style(); - if ( style && style->font_desc ) - { - 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", - &font_name, - NULL); - if (!font_name) - attr.font = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - 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) { @@ -247,7 +232,7 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void), //static wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gchar*), +wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t widget_new, bool useBase, int state) { @@ -264,7 +249,7 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gcha //static wxVisualAttributes -wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*), +wxControl::GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t widget_new, bool useBase, int state) { @@ -279,4 +264,3 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm } #endif // wxUSE_CONTROLS -