Translated a double click into just a second click for Scintilla

[wxWidgets.git] / contrib / src / xml / xmlres.cpp

diff --git a/contrib/src/xml/xmlres.cpp b/contrib/src/xml/xmlres.cpp
index 7a5bd4ee74221d8e92dc89347747a27a1b25356d..455314518d72c8b9b05f7f29acd9e5ca2389e1c4 100644 (file)
--- a/contrib/src/xml/xmlres.cpp
+++ b/contrib/src/xml/xmlres.cpp
@@ -195,6 +195,19 @@ wxIcon wxXmlResource::LoadIcon(const wxString& name)
     return rt;
 }
 
+bool wxXmlResource::AttachUnknownControl(const wxString& name, 
+                                         wxWindow *control, wxWindow *parent)
+{
+    if (parent == NULL)
+        parent = control->GetParent();
+    wxWindow *container = parent->FindWindow(name + wxT("_container"));
+    if (!container)
+    {
+        wxLogError(_("Cannot find container for unknown control '%s'."), name.c_str());
+        return FALSE;
+    }
+    return control->Reparent(container);
+}
 
 
 void wxXmlResource::ProcessPlatformProperty(wxXmlNode *node)
@@ -438,6 +451,7 @@ void wxXmlResourceHandler::AddWindowStyles()
     ADD_STYLE(wxDOUBLE_BORDER);
     ADD_STYLE(wxRAISED_BORDER);
     ADD_STYLE(wxSTATIC_BORDER);
+    ADD_STYLE(wxNO_BORDER);
     ADD_STYLE(wxTRANSPARENT_WINDOW);
     ADD_STYLE(wxWANTS_CHARS);
     ADD_STYLE(wxNO_FULL_REPAINT_ON_RESIZE);
@@ -882,8 +896,6 @@ void wxXmlResourceHandler::CreateChildrenPrivately(wxObject *parent, wxXmlNode *
 
 
 
-
-
 // --------------- XMLID implementation -----------------------------
 
 #define XMLID_TABLE_SIZE     1024