projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove m_use_events from Unix wxSocket implementation, we always need asynchronous...
[wxWidgets.git]
/
include
/
wx
/
gtk
/
textctrl.h
diff --git
a/include/wx/gtk/textctrl.h
b/include/wx/gtk/textctrl.h
index 57d52e3b80ae211a29e6fc84b85f224c287e0e43..a06a8a63455ab536b9b139a2693b91d239a5dea3 100644
(file)
--- a/
include/wx/gtk/textctrl.h
+++ b/
include/wx/gtk/textctrl.h
@@
-121,11
+121,6
@@
public:
void SetUpdateFont(bool WXUNUSED(update)) { }
void SetUpdateFont(bool WXUNUSED(update)) { }
- // GTK+ textctrl is so dumb that you need to freeze/thaw it manually to
- // avoid horrible flicker/scrolling back and forth
- virtual void Freeze();
- virtual void Thaw();
-
// implementation only from now on
// tell the control to ignore next text changed signal
// implementation only from now on
// tell the control to ignore next text changed signal
@@
-148,9
+143,6
@@
public:
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
static wxVisualAttributes
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
- // has the control been frozen by Freeze()?
- bool IsFrozen() const { return m_freezeCount > 0; }
-
protected:
// wxGTK-specific: called recursively by Enable,
// to give widgets an oppprtunity to correct their colours after they
protected:
// wxGTK-specific: called recursively by Enable,
// to give widgets an oppprtunity to correct their colours after they
@@
-162,6
+154,9
@@
protected:
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
virtual void DoApplyWidgetStyle(GtkRcStyle *style);
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+ virtual void DoFreeze();
+ virtual void DoThaw();
+
// common part of all ctors
void Init();
// common part of all ctors
void Init();
@@
-176,6
+171,7
@@
protected:
// set the given characteristic)
void GTKSetEditable();
void GTKSetVisibility();
// set the given characteristic)
void GTKSetEditable();
void GTKSetVisibility();
+ void GTKSetActivatesDefault();
void GTKSetWrapMode();
void GTKSetJustification();
void GTKSetWrapMode();
void GTKSetJustification();
@@
-199,8
+195,8
@@
private:
// both
void *GetTextObject() const
{
// both
void *GetTextObject() const
{
- return IsMultiLine() ?
wx_static_cast(void *,
m_buffer)
- :
wx_static_cast(void *,
m_text);
+ return IsMultiLine() ?
static_cast<void *>(
m_buffer)
+ :
static_cast<void *>(
m_text);
}
}
@@
-216,8
+212,6
@@
private:
// a dummy one when frozen
GtkTextBuffer *m_buffer;
// a dummy one when frozen
GtkTextBuffer *m_buffer;
- // number of calls to Freeze() minus number of calls to Thaw()
- unsigned m_freezeCount;
GtkTextMark* m_showPositionOnThaw;
// For wxTE_AUTO_URL
GtkTextMark* m_showPositionOnThaw;
// For wxTE_AUTO_URL