#include "wx/fontutil.h"
#include "wx/gtk/private.h"
+#include "wx/private/stattext.h"
+
+
// ============================================================================
// wxControl implementation
// ============================================================================
wxControl::wxControl()
{
- m_needParent = true;
}
bool wxControl::Create( wxWindow *parent,
gtk_widget_ensure_style(m_widget);
ApplyWidgetStyle();
- SetInitialBestSize(size);
+ SetInitialSize(size);
}
// ----------------------------------------------------------------------------
// wxControl dealing with labels
// ----------------------------------------------------------------------------
-void wxControl::SetLabel( const wxString &label )
+void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
{
- // keep the original string internally to be able to return it later (for
- // consistency with the other ports)
- m_label = label;
+ // save the original label
+ wxControlBase::SetLabel(label);
- InvalidateBestSize();
+ const wxString labelGTK = GTKConvertMnemonics(label);
+ gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
}
-wxString wxControl::GetLabel() const
+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));
}
-void wxControl::GTKSetLabelForLabel(GtkLabel *w, const wxString& label)
-{
- // don't call the virtual function which might call this one back again
- wxControl::SetLabel(label);
-
- const wxString labelGTK = GTKConvertMnemonics(label);
-
- gtk_label_set_text_with_mnemonic(w, wxGTK_CONV(labelGTK));
-}
// ----------------------------------------------------------------------------
// GtkFrame helpers
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)
}
// ----------------------------------------------------------------------------
-// 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
+ MNEMONICS_CONVERT,
+ MNEMONICS_CONVERT_MARKUP
};
-static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
+static wxString GTKProcessMnemonics(const wxChar* label, MnemonicsFlag flag)
{
- const size_t len = label.length();
+ const size_t len = wxStrlen(label);
wxString labelGTK;
labelGTK.reserve(len);
for ( size_t i = 0; i < len; i++ )
if ( i == len - 1 )
{
// "&" at the end of string is an error
- wxLogDebug(wxT("Invalid label \"%s\"."), label.c_str());
+ wxLogDebug(wxT("Invalid label \"%s\"."), label);
break;
}
+ if ( flag == MNEMONICS_CONVERT_MARKUP )
+ {
+ bool isMnemonic = true;
+
+ // is this ampersand introducing a mnemonic or rather an entity?
+ for (size_t j=0; j < wxMARKUP_ENTITY_MAX; j++)
+ {
+ const wxChar *entity = wxMarkupEntities[wxMARKUP_ELEMENT_NAME][j];
+ size_t entityLen = wxStrlen(entity);
+
+ if (len - i >= entityLen &&
+ wxStrncmp(entity, &label[i], entityLen) == 0)
+ {
+ labelGTK << entity;
+ i += entityLen - 1; // the -1 is because main for()
+ // loop already increments i
+ isMnemonic = false;
+
+ break;
+ }
+ }
+
+ if (!isMnemonic)
+ continue;
+ }
+
ch = label[++i]; // skip '&' itself
switch ( ch )
{
case wxT('&'):
// special case: "&&" is not a mnemonic at all but just
// an escaped "&"
- labelGTK += wxT('&');
+ if ( flag == MNEMONICS_CONVERT_MARKUP )
+ labelGTK += wxT("&");
+ else
+ labelGTK += wxT('&');
break;
case wxT('_'):
- if ( flag == MNEMONICS_CONVERT )
+ if ( flag != MNEMONICS_REMOVE )
{
// '_' can't be a GTK mnemonic apparently so
// replace it with something similar
//else: fall through
default:
- if ( flag == MNEMONICS_CONVERT )
+ if ( flag != MNEMONICS_REMOVE )
labelGTK += wxT('_');
labelGTK += ch;
}
break;
case wxT('_'):
- if ( flag == MNEMONICS_CONVERT )
+ if ( flag != MNEMONICS_REMOVE )
{
// escape any existing underlines in the string so that
// they don't become mnemonics accidentally
return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
}
+/* static */
+wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label)
+{
+ return GTKProcessMnemonics(label, MNEMONICS_CONVERT_MARKUP);
+}
+
// ----------------------------------------------------------------------------
// wxControl styles (a.k.a. attributes)
// ----------------------------------------------------------------------------
UseGTKStyleBase());
}
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
-
// static
wxVisualAttributes
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 )
{
if ( GtkShowFromOnIdle() )
return;
-
- GTKUpdateCursor();
+
+ if ( GTK_WIDGET_REALIZED(m_widget) )
+ {
+ GTKUpdateCursor();
+
+ GTKSetDelayedFocusIfNeeded();
+ }
if ( wxUpdateUIEvent::CanUpdate(this) )
UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
projects / wxWidgets.git / blobdiff