generate middle click events (patch 1521314)

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

diff --git a/src/xrc/xh_chckl.cpp b/src/xrc/xh_chckl.cpp
index e68540722dac06ece9a3b2aa52f65f48d4bf8b8b..d3a8257cd3bf9efb69cd2140daac85274fc0b8a4 100644 (file)
--- a/src/xrc/xh_chckl.cpp
+++ b/src/xrc/xh_chckl.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xh_chckl.cpp
+// Name:        src/xrc/xh_chckl.cpp

 // Purpose:     XRC resource for wxCheckList
 // Author:      Bob Mitchell
 // Created:     2000/03/21
 // Purpose:     XRC resource for wxCheckList
 // Author:      Bob Mitchell
 // Created:     2000/03/21


@@ -7,10 +7,6 @@
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
-#ifdef __GNUG__
-#pragma implementation "xh_chckl.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,25 +15,47 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_OWNER_DRAWN || !defined(__WXMSW__)
+#if wxUSE_XRC && wxUSE_CHECKLISTBOX

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

-#include "wx/checklst.h"
-#include "wx/intl.h"

 
 

-wxCheckListXmlHandler::wxCheckListXmlHandler() 
-: wxXmlResourceHandler(), m_insideBox(FALSE)
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/checklst.h"
+#endif
+
+IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
+
+wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
+: wxXmlResourceHandler(), m_insideBox(false)

 {
 {

-    // no styles
+    // wxListBox styles:
+    XRC_ADD_STYLE(wxLB_SINGLE);
+    XRC_ADD_STYLE(wxLB_MULTIPLE);
+    XRC_ADD_STYLE(wxLB_EXTENDED);
+    XRC_ADD_STYLE(wxLB_HSCROLL);
+    XRC_ADD_STYLE(wxLB_ALWAYS_SB);
+    XRC_ADD_STYLE(wxLB_NEEDED_SB);
+    XRC_ADD_STYLE(wxLB_SORT);
+

     AddWindowStyles();
 }
 
     AddWindowStyles();
 }
 

-wxObject *wxCheckListXmlHandler::DoCreateResource()
-{ 
-    if (m_class == wxT("wxCheckList"))
+wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
+{
+    if (m_class == wxT("wxCheckListBox")
+#if WXWIN_COMPATIBILITY_2_4
+        || m_class == wxT("wxCheckList")
+#endif
+       )

     {
     {

+#if WXWIN_COMPATIBILITY_2_4
+        if (m_class == wxT("wxCheckList"))
+            wxLogDebug(wxT("'wxCheckList' name is deprecated, use 'wxCheckListBox' instead."));
+#endif

         // need to build the list of strings from children
         // need to build the list of strings from children

-        m_insideBox = TRUE;
+        m_insideBox = true;

         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)
         CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
         wxString *strings = (wxString *) NULL;
         if (strList.GetCount() > 0)


@@ -73,17 +91,17 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
             wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
             v.MakeLower();
             if (v && v == wxT("1"))
             wxString v = n->GetPropVal(wxT("checked"), wxEmptyString);
             v.MakeLower();
             if (v && v == wxT("1"))

-                control->Check( i, TRUE );
+                control->Check( i, true );

 
 

-            i++;        
+            i++;

             n = n->GetNext();
         }
             n = n->GetNext();
         }

-        
+

         SetupWindow(control);
 
         if (strings != NULL)
             delete[] strings;
         SetupWindow(control);
 
         if (strings != NULL)
             delete[] strings;

-        strList.Clear();    // dump the strings   
+        strList.Clear();    // dump the strings

 
         return control;
     }
 
         return control;
     }


@@ -101,10 +119,13 @@ wxObject *wxCheckListXmlHandler::DoCreateResource()
     }
 }
 
     }
 }
 

-bool wxCheckListXmlHandler::CanHandle(wxXmlNode *node)
+bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)

 {
 {

-    return (IsOfClass(node, wxT("wxCheckList")) ||
+    return (IsOfClass(node, wxT("wxCheckListBox")) ||
+#if WXWIN_COMPATIBILITY_2_4
+            IsOfClass(node, wxT("wxCheckList")) ||
+#endif

            (m_insideBox && node->GetName() == wxT("item")));
 }
 
            (m_insideBox && node->GetName() == wxT("item")));
 }
 

-#endif
+#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX