#include "wx/fontutil.h"
#include "wx/gtk/private.h"
+#include "wx/utils.h"
+#include "wx/sysopt.h"
-#include "wx/private/stattext.h"
-
+#include "wx/gtk/private/mnemonics.h"
// ============================================================================
// wxControl implementation
// 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;
}
// GetBestSize is called.
gtk_widget_ensure_style(m_widget);
- 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 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();
+ }
+ }
+}
+
// ----------------------------------------------------------------------------
// 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
void wxControl::GTKSetLabelForFrame(GtkFrame *w, const wxString& label)
{
+ wxControlBase::SetLabel(label);
+
GtkLabel* labelwidget = GTK_LABEL(gtk_frame_get_label_widget(w));
GTKSetLabelForLabel(labelwidget, label);
}
// worker function implementing GTK*Mnemonics() functions
// ----------------------------------------------------------------------------
-enum MnemonicsFlag
-{
- MNEMONICS_REMOVE,
- MNEMONICS_CONVERT,
- MNEMONICS_CONVERT_MARKUP
-};
-
-static wxString GTKProcessMnemonics(const wxString& label, MnemonicsFlag flag)
-{
- wxString labelGTK;
- labelGTK.reserve(label.length());
- for ( wxString::const_iterator i = label.begin(); i != label.end(); ++i )
- {
- wxChar ch = *i;
-
- switch ( ch )
- {
- case wxT('&'):
- if ( i + 1 == label.end() )
- {
- // "&" at the end of string is an error
- wxLogDebug(wxT("Invalid label \"%s\"."), label);
- break;
- }
-
- if ( flag == MNEMONICS_CONVERT_MARKUP )
- {
- bool isMnemonic = true;
- size_t distanceFromEnd = label.end() - i;
-
- // 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 (distanceFromEnd >= entityLen &&
- wxString(i, i + entityLen) == entity)
- {
- labelGTK << entity;
- i += entityLen - 1; // the -1 is because main for()
- // loop already increments i
- isMnemonic = false;
-
- break;
- }
- }
-
- if (!isMnemonic)
- continue;
- }
-
- ch = *(++i); // skip '&' itself
- switch ( ch )
- {
- case wxT('&'):
- // special case: "&&" is not a mnemonic at all but just
- // an escaped "&"
- if ( flag == MNEMONICS_CONVERT_MARKUP )
- labelGTK += wxT("&");
- else
- labelGTK += wxT('&');
- break;
-
- case wxT('_'):
- if ( flag != MNEMONICS_REMOVE )
- {
- // '_' can't be a GTK mnemonic apparently so
- // replace it with something similar
- labelGTK += wxT("_-");
- break;
- }
- //else: fall through
-
- default:
- if ( flag != MNEMONICS_REMOVE )
- labelGTK += wxT('_');
- labelGTK += ch;
- }
- break;
-
- case wxT('_'):
- if ( flag != MNEMONICS_REMOVE )
- {
- // 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;
-}
-
/* static */
wxString wxControl::GTKRemoveMnemonics(const wxString& label)
{
- return GTKProcessMnemonics(label, MNEMONICS_REMOVE);
+ return wxGTKRemoveMnemonics(label);
}
/* static */
wxString wxControl::GTKConvertMnemonics(const wxString& label)
{
- return GTKProcessMnemonics(label, MNEMONICS_CONVERT);
+ return wxConvertMnemonicsToGTK(label);
}
/* static */
wxString wxControl::GTKConvertMnemonicsWithMarkup(const wxString& label)
{
- return GTKProcessMnemonics(label, MNEMONICS_CONVERT_MARKUP);
+ return wxConvertMnemonicsToGTKMarkup(label);
}
// ----------------------------------------------------------------------------
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)
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
{
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
projects / wxWidgets.git / blobdiff