Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
J. Russell Smyth
1999-03-21 08:20:38 +00:00
parent fad866f4b7
commit aeab6775d8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/listbox.cpp
View File

@@ -105,18 +105,18 @@ bool wxListBox::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
event.m_clientData = GetClientData(event.m_commandInt); event.m_clientData = GetClientData(event.m_commandInt);
wxString str(GetString(event.m_commandInt)); wxString str(GetString(event.m_commandInt));
if (str != "") if (str != "")
event.m_commandString = copystring((char *)(const char *)str); {
event.m_commandString = str;
}
} }
else else
{ {
event.m_commandInt = -1 ; event.m_commandInt = -1 ;
event.m_commandString = copystring("") ; event.m_commandString.Empty();
} }
event.SetEventObject( this ); event.SetEventObject( this );
ProcessCommand(event); ProcessCommand(event);
if (event.m_commandString)
delete[] event.m_commandString ;
return TRUE; return TRUE;
} }
else if (param == LBN_DBLCLK) else if (param == LBN_DBLCLK)

2
utils/framelayout/samples/demo/Makefile.vc
View File

@@ -15,7 +15,7 @@ EXTRAINC = -I..\..\src
EXTRALIBS = $(WXDIR)\lib\fl.lib EXTRALIBS = $(WXDIR)\lib\fl.lib
EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED EXTRAFLAGS = /DwxDUMMY_OBJ_INCLUDED
PROGRAM=fl_demo PROGRAM=fl_demo
OBJECTS = $(PROGRAM).obj OBJECTS = $(PROGRAM).obj settingsdlg.obj wxinfo.obj
!include $(WXDIR)\src\makeprog.vc !include $(WXDIR)\src\makeprog.vc

2
utils/framelayout/src/makefile.vc
View File

@@ -22,7 +22,7 @@ OBJECTS = antiflickpl.obj bardragpl.obj barhintspl.obj cbcustom.obj\
cbstore.obj controlarea.obj controlbar.obj dyntbar.obj dyntbarhnd.obj\ cbstore.obj controlarea.obj controlbar.obj dyntbar.obj dyntbarhnd.obj\
frmview.obj garbagec.obj gcupdatesmgr.obj hintanimpl.obj newbmpbtn.obj\ frmview.obj garbagec.obj gcupdatesmgr.obj hintanimpl.obj newbmpbtn.obj\
objstore.obj panedrawpl.obj pf_sample.obj rowdragpl.obj rowlayoutpl.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 !include $(WXDIR)\src\makelib.vc