X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..8de5b24e54bd7fec2a9e2011b2402b3f33117bd7:/include/wx/gtk1/textctrl.h diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h index a7fdeb1201..3832c956dc 100644 --- a/include/wx/gtk1/textctrl.h +++ b/include/wx/gtk1/textctrl.h @@ -11,7 +11,7 @@ #ifndef __GTKTEXTCTRLH__ #define __GTKTEXTCTRLH__ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "textctrl.h" #endif @@ -65,7 +65,8 @@ public: virtual void Replace(long from, long to, const wxString& value); virtual void Remove(long from, long to); - // clears the dirty flag + // sets/clears the dirty flag + virtual void MarkDirty(); virtual void DiscardEdits(); virtual void SetMaxLength(unsigned long len); @@ -132,7 +133,7 @@ public: GtkWidget* GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); void CalculateScrollbar(); void OnInternalIdle(); void UpdateFontIfNeeded(); @@ -161,6 +162,9 @@ public: // should we ignore the changed signal? always resets the flag bool IgnoreTextUpdate(); + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + protected: virtual wxSize DoGetBestSize() const; @@ -174,6 +178,10 @@ protected: // scroll position changed bool DoScroll(GtkAdjustment *adj, int diff); + // Widgets that use the style->base colour for the BG colour should + // override this and return true. + virtual bool UseGTKStyleBase() const { return true; } + private: // change the font for everything in this control void ChangeFontGlobally();