Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

[wxWidgets.git] / src / xrc / xh_text.cpp

diff --git a/src/xrc/xh_text.cpp b/src/xrc/xh_text.cpp
index 26d8510c90656cb6605e8801d0417a73377f1181..33e41604cb817c9bdb985605a4c979037911fb0d 100644 (file)
--- a/src/xrc/xh_text.cpp
+++ b/src/xrc/xh_text.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_text.cpp
-// Purpose:     XML resource for wxTextCtrl
+// Name:        src/xrc/xh_text.cpp
+// Purpose:     XRC resource for wxTextCtrl

 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Aleksandras Gluchovas
 // Created:     2000/03/21
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Aleksandras Gluchovas
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
-#pragma implementation "xh_text.h"
-#endif

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"


@@ -19,40 +15,70 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC && wxUSE_TEXTCTRL
+

 #include "wx/xrc/xh_text.h"
 #include "wx/xrc/xh_text.h"

-#include "wx/textctrl.h"

 
 

-wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler() 
+#ifndef WX_PRECOMP
+    #include "wx/textctrl.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandler, wxXmlResourceHandler)
+
+wxTextCtrlXmlHandler::wxTextCtrlXmlHandler() : wxXmlResourceHandler()

 {
 {

-    ADD_STYLE(wxTE_PROCESS_ENTER);
-    ADD_STYLE(wxTE_PROCESS_TAB);
-    ADD_STYLE(wxTE_MULTILINE);
-    ADD_STYLE(wxTE_PASSWORD);
-    ADD_STYLE(wxTE_READONLY);
-    ADD_STYLE(wxHSCROLL);
+    XRC_ADD_STYLE(wxTE_NO_VSCROLL);
+    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
+    XRC_ADD_STYLE(wxTE_PROCESS_TAB);
+    XRC_ADD_STYLE(wxTE_MULTILINE);
+    XRC_ADD_STYLE(wxTE_PASSWORD);
+    XRC_ADD_STYLE(wxTE_READONLY);
+    XRC_ADD_STYLE(wxHSCROLL);
+    XRC_ADD_STYLE(wxTE_RICH);
+    XRC_ADD_STYLE(wxTE_RICH2);
+    XRC_ADD_STYLE(wxTE_AUTO_URL);
+    XRC_ADD_STYLE(wxTE_NOHIDESEL);
+    XRC_ADD_STYLE(wxTE_LEFT);
+    XRC_ADD_STYLE(wxTE_CENTRE);
+    XRC_ADD_STYLE(wxTE_RIGHT);
+    XRC_ADD_STYLE(wxTE_DONTWRAP);
+#if WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxTE_LINEWRAP);
+#endif // WXWIN_COMPATIBILITY_2_6
+    XRC_ADD_STYLE(wxTE_CHARWRAP);
+    XRC_ADD_STYLE(wxTE_WORDWRAP);
+
+    // this style doesn't exist since wx 2.9.0 but we still support it (by
+    // ignoring it silently) in XRC files to avoid unimportant warnings when
+    // using XRC produced by old tools
+    AddStyle(wxT("wxTE_AUTO_SCROLL"), 0);
+

     AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxTextCtrlXmlHandler::DoCreateResource()

-{ 
-    wxTextCtrl *text = new wxTextCtrl(m_parentAsWindow,
-                                    GetID(),
-                                    GetText(wxT("value")),
-                                    GetPosition(), GetSize(),
-                                    GetStyle(),
-                                    wxDefaultValidator,
-                                    GetName()
-                                    );
+{
+    XRC_MAKE_INSTANCE(text, wxTextCtrl)
+
+    text->Create(m_parentAsWindow,
+                 GetID(),
+                 GetText(wxT("value")),
+                 GetPosition(), GetSize(),
+                 GetStyle(),
+                 wxDefaultValidator,
+                 GetName());
+

     SetupWindow(text);
     SetupWindow(text);

-    
-    return text;
-}

 
 

+    if (HasParam(wxT("maxlength")))
+        text->SetMaxLength(GetLong(wxT("maxlength")));

 
 

+    return text;
+}

 
 bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 
 
 bool wxTextCtrlXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxTextCtrl"));
 }
 

-
+#endif // wxUSE_XRC && wxUSE_TEXTCTRL