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 f4119aa3eb9b6afa9a70c957628ba1bed99af4b1..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


@@ -108,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


@@ -179,7 +179,6 @@ 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
 
 protected:
     // common part of all ctors


@@ -256,6 +255,8 @@ private:
     // the simple EDIT controls
     virtual WXHWND GetEditHWND() const { return m_hWnd; }
 
     // 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)