added wxUSE_ACTIVEX which depends on wxUSE_VARIANT and which wxUSE_MEDIACTRL depends...

[wxWidgets.git] / include / wx / x11 / textctrl.h

diff --git a/include/wx/x11/textctrl.h b/include/wx/x11/textctrl.h
index 1b8f0143a2520066a141c8afd077061372f97282..197acb64b560372dc9cfdafe2f246d9a27766f06 100644 (file)
--- a/include/wx/x11/textctrl.h
+++ b/include/wx/x11/textctrl.h
@@ -19,10 +19,6 @@
 #include "wx/univ/textctrl.h"
 #else
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "textctrl.h"
-#endif
-
 #include "wx/scrolwin.h"
 #include "wx/arrstr.h"
 #include "wx/datetime.h"
@@ -31,7 +27,7 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxTextCtrl;
+class WXDLLIMPEXP_CORE wxTextCtrl;
 
 //-----------------------------------------------------------------------------
 // helpers
@@ -89,7 +85,7 @@ enum wxSourceLanguage
 // wxTextCtrl
 //-----------------------------------------------------------------------------
 
-class wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper
+class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper
 {
 public:
     wxTextCtrl() { Init(); }
@@ -133,9 +129,12 @@ public:
     // more readable flag testing methods
     // ----------------------------------
 
+#if 0
+    // it seems now in wxTextCtrlBase
     bool IsSingleLine() const { return !(GetWindowStyle() & wxTE_MULTILINE); }
+#endif
     bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
-    bool WrapLines() const { return FALSE; }
+    bool WrapLines() const { return false; }
 
     // If the return values from and to are the same, there is no selection.
     virtual void GetSelection(long* from, long* to) const;
@@ -180,18 +179,18 @@ public:
     virtual void Redo() {}
 
     virtual bool CanUndo() const    { return (m_undos.GetCount() > 0); }
-    virtual bool CanRedo() const    { return FALSE; }
+    virtual bool CanRedo() const    { return false; }
 
     // Insertion point
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
-    virtual bool Enable( bool enable = TRUE );
+    virtual bool Enable( bool enable = true );
 
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
@@ -209,7 +208,7 @@ public:
     bool SetForegroundColour(const wxColour& colour);
     bool SetBackgroundColour(const wxColour& colour);
 
-    void SetModified() { m_modified = TRUE; }
+    void SetModified() { m_modified = true; }
 
     virtual void Freeze();
     virtual void Thaw();
@@ -263,7 +262,7 @@ public:
     void OnInternalIdle();
     void RefreshLine( int n );
     void RefreshDown( int n );
-    void MoveCursor( int new_x, int new_y, bool shift = FALSE, bool centre = FALSE );
+    void MoveCursor( int new_x, int new_y, bool shift = false, bool centre = false );
     void MyAdjustScrollbars();
 
 protected:
@@ -367,13 +366,6 @@ private:
 // wxTextCtrl types
 // ----------------------------------------------------------------------------
 
-// wxTextPos is the position in the text
-typedef long wxTextPos;
-
-// wxTextCoord is the line or row number (which should have been unsigned but
-// is long for backwards compatibility)
-typedef long wxTextCoord;
-
 class WXDLLEXPORT wxStdTextCtrlInputHandler : public wxStdInputHandler
 {
 public:
@@ -381,10 +373,10 @@ public:
 
     virtual bool HandleKey(wxInputConsumer *consumer,
                            const wxKeyEvent& event,
-                           bool pressed) { return FALSE; }
-    virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return FALSE; }
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return FALSE; }
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return FALSE; }
+                           bool pressed) { return false; }
+    virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
+    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
+    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return false; }
 
 protected:
     // get the position of the mouse click