Modified wxMSW listbox.cpp to work with wxCommandEvent::m_commandString

as wxString
Modified framelayout Makefile.vc's for move of settingsdlg.[h,cpp] and
wxinfo.[h,cpp] to sample/demo

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 8182a7ced8e1fcb6185a31216d5da142f7749adb..63574bbefd0f90c7fa9bc94180e9c701277f9d68 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -105,18 +105,18 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
             event.m_clientData = GetClientData(event.m_commandInt);
             wxString str(GetString(event.m_commandInt));
             if (str != "")
-                event.m_commandString = copystring((char *)(const char *)str);
+            {
+               event.m_commandString = str;
+            }
         }
         else
         {
             event.m_commandInt = -1 ;
-            event.m_commandString = copystring("") ;
+            event.m_commandString.Empty();
         }
 
         event.SetEventObject( this );
         ProcessCommand(event);
-        if (event.m_commandString)
-            delete[] event.m_commandString ;
         return TRUE;
     }
     else if (param == LBN_DBLCLK)

diff --git a/utils/framelayout/samples/demo/Makefile.vc b/utils/framelayout/samples/demo/Makefile.vc
index 8af9e3b0560d7cc0ac17393018ad3cfc0f31c5be..582efd661d007929578eca734e5911c82042cf34 100644 (file)
--- a/utils/framelayout/samples/demo/Makefile.vc
+++ b/utils/framelayout/samples/demo/Makefile.vc
@@ -15,7 +15,7 @@ EXTRAINC = -I..\..\src
 EXTRALIBS = $(WXDIR)\lib\fl.lib
 EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED
 PROGRAM=fl_demo
-OBJECTS = $(PROGRAM).obj
+OBJECTS = $(PROGRAM).obj settingsdlg.obj wxinfo.obj
 
 !include $(WXDIR)\src\makeprog.vc
 

diff --git a/utils/framelayout/src/makefile.vc b/utils/framelayout/src/makefile.vc
index 8082739e77df1c8a9dee9edcab71aa568b8858bb..deb4cc5e040c73249e60198f0e45bdbdaf05d131 100644 (file)
--- a/utils/framelayout/src/makefile.vc
+++ b/utils/framelayout/src/makefile.vc
@@ -22,7 +22,7 @@ OBJECTS = antiflickpl.obj bardragpl.obj barhintspl.obj cbcustom.obj\
  cbstore.obj controlarea.obj controlbar.obj dyntbar.obj dyntbarhnd.obj\
  frmview.obj garbagec.obj gcupdatesmgr.obj hintanimpl.obj newbmpbtn.obj\
  objstore.obj panedrawpl.obj pf_sample.obj rowdragpl.obj rowlayoutpl.obj\
- settingsdlg.obj toolwnd.obj updatesmgr.obj wxinfo.obj
+ toolwnd.obj updatesmgr.obj
 
 !include $(WXDIR)\src\makelib.vc