Rebake from clean wx tree.

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index bb89c204f592bb90da52f8da8695ca62043a0f6d..5354104c74d6b488380a50ad3a3e9fc4b7e8bfec 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
+class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase

 {
 public:
     // creation
 {
 public:
     // creation


@@ -71,8 +71,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual bool DoLoadFile(const wxString& file, int fileType);
-

     virtual bool IsModified() const;
     virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;
     virtual void MarkDirty();
     virtual void DiscardEdits();


@@ -110,7 +108,7 @@ public:
 
     // Implementation from now on
     // --------------------------
 
     // Implementation from now on
     // --------------------------

- 
+

 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
 #if wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
     virtual void SetDropTarget(wxDropTarget *dropTarget);
 #endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT


@@ -181,12 +179,13 @@ public:
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
     virtual bool MSWShouldPreProcessMessage(WXMSG* pMsg);
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;

-    virtual wxVisualAttributes GetDefaultAttributes() const;

 
 protected:
     // common part of all ctors
     void Init();
 
 
 protected:
     // common part of all ctors
     void Init();
 

+    virtual bool DoLoadFile(const wxString& file, int fileType);
+

     // creates the control of appropriate class (plain or rich edit) with the
     // styles corresponding to m_windowStyle
     //
     // creates the control of appropriate class (plain or rich edit) with the
     // styles corresponding to m_windowStyle
     //


@@ -198,10 +197,6 @@ protected:
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 
 
     virtual void DoSetValue(const wxString &value, int flags = 0);
 

-    // implement wxTextEntry pure virtual: it implements all the operations for
-    // the simple EDIT controls
-    virtual WXHWND GetEditHWND() const { return m_hWnd; }
-

     // return true if this control has a user-set limit on amount of text (i.e.
     // the limit is due to a previous call to SetMaxLength() and not built in)
     bool HasSpaceLimit(unsigned int *len) const;
     // return true if this control has a user-set limit on amount of text (i.e.
     // the limit is due to a previous call to SetMaxLength() and not built in)
     bool HasSpaceLimit(unsigned int *len) const;


@@ -250,12 +245,18 @@ protected:
     // text ourselves: we want this to be exactly 1
     int m_updatesCount;
 
     // text ourselves: we want this to be exactly 1
     int m_updatesCount;
 

+private:

     virtual void EnableTextChangedEvents(bool enable)
     {
         m_updatesCount = enable ? -1 : -2;
     }
 
     virtual void EnableTextChangedEvents(bool enable)
     {
         m_updatesCount = enable ? -1 : -2;
     }
 

-private:
+    // implement wxTextEntry pure virtual: it implements all the operations for
+    // the simple EDIT controls
+    virtual WXHWND GetEditHWND() const { return m_hWnd; }
+
+    void OnKeyDown(wxKeyEvent& event);
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxTextCtrl)