X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ce832135e0cd665403406e7276630f415a7875b..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk/textctrl.h?ds=inline diff --git a/include/wx/gtk/textctrl.h b/include/wx/gtk/textctrl.h index 336a5cfa2e..5db8cb09e7 100644 --- a/include/wx/gtk/textctrl.h +++ b/include/wx/gtk/textctrl.h @@ -145,28 +145,26 @@ public: GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: - // wxGTK-specific: called recursively by Enable, - // to give widgets an oppprtunity to correct their colours after they - // have been changed by Enable - virtual void OnEnabled(bool enable); - // overridden wxWindow virtual methods virtual wxSize DoGetBestSize() const; virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + virtual void DoFreeze(); virtual void DoThaw(); - // common part of all ctors - void Init(); - // Widgets that use the style->base colour for the BG colour should // override this and return true. virtual bool UseGTKStyleBase() const { return true; } virtual void DoSetValue(const wxString &value, int flags = 0); + // Override this to use either GtkEntry or GtkTextView IME depending on the + // kind of control we are. + virtual int GTKIMFilterKeypress(GdkEventKey* event) const; + virtual wxPoint DoPositionToCoords(long pos) const; // wrappers hiding the differences between functions doing the same thing @@ -179,6 +177,8 @@ protected: void GTKSetJustification(); private: + void Init(); + // overridden wxTextEntry virtual methods virtual GtkEditable *GetEditable() const; virtual GtkEntry *GetEntry() const;