Added wxDllLoader::UnloadLibrary()

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

diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h
index 2ca8490c14eb1241de508648edbd4842c6202147..af31bad26ff011eea8808d976ec2a8e94e4c19cb 100644 (file)
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -25,7 +25,7 @@
     #include <iostream>
 #endif
 
-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__WXWINE__)
     #define wxUSE_RICHEDIT 1
 #else
     #define wxUSE_RICHEDIT 0
@@ -59,7 +59,8 @@ public:
     wxTextCtrl(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
             const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxSize& size = wxDefaultSize,
+            long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxTextCtrlNameStr)
 #ifndef NO_TEXT_WINDOW_STREAM
@@ -72,13 +73,15 @@ public:
     bool Create(wxWindow *parent, wxWindowID id,
             const wxString& value = wxEmptyString,
             const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = wxTE_PROCESS_TAB,
+            const wxSize& size = wxDefaultSize,
+            long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxTextCtrlNameStr);
 
     // accessors
     // ---------
-    virtual wxString GetValue() const ;
+
+    virtual wxString GetValue() const;
     virtual void SetValue(const wxString& value);
 
     virtual int GetLineLength(long lineNo) const;
@@ -148,6 +151,26 @@ public:
     virtual void ShowPosition(long pos);
     virtual void Clear();
 
+    // Implementation from now on
+    // --------------------------
+
+    virtual void Command(wxCommandEvent& event);
+    virtual bool MSWCommand(WXUINT param, WXWORD id);
+
+#if wxUSE_RICHEDIT
+    bool IsRich() const { return m_isRich; }
+    void SetRichEdit(bool isRich) { m_isRich = isRich; }
+#endif
+
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam,
+            WXLPARAM lParam);
+
+    virtual void AdoptAttributesFromHWND();
+    virtual void SetupColours();
+
+    virtual bool AcceptsFocus() const;
+
     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
@@ -165,24 +188,6 @@ public:
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
 
-    // Implementation
-    // --------------
-    virtual void Command(wxCommandEvent& event);
-    virtual bool MSWCommand(WXUINT param, WXWORD id);
-
-#if wxUSE_RICHEDIT
-    bool IsRich() const { return m_isRich; }
-    void SetRichEdit(bool isRich) { m_isRich = isRich; }
-#endif
-
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-            WXUINT message, WXWPARAM wParam,
-            WXLPARAM lParam);
-
-    virtual void AdoptAttributesFromHWND();
-    virtual void SetupColours();
-    virtual long MSWGetDlgCode();
-
 protected:
 #if wxUSE_RICHEDIT
     bool      m_isRich; // Are we using rich text edit to implement this?
@@ -194,9 +199,7 @@ protected:
     // limit is big enough)
     void AdjustSpaceLimit();
 
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+    virtual wxSize DoGetBestSize();
 
 private:
     DECLARE_EVENT_TABLE()