Applied hash copy fix, BC++ makefile fix (though not the lib setup.h one we need to do).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b3260bce47
commit
ea45082521
@ -158,7 +158,13 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||
|
||||
default: wx
|
||||
|
||||
wx: $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
|
||||
wx: setuph $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
|
||||
|
||||
# TODO: put the setup.h under lib
|
||||
setuph:
|
||||
cd $(WXDIR)\include\wx\msw
|
||||
if not exist setup.h copy setup0.h setup.h
|
||||
cd $(WXDIR)\src\msw
|
||||
|
||||
all: wx
|
||||
|
||||
|
@ -370,6 +370,7 @@ bool wxHashTable::Create(int the_key_type, int size)
|
||||
void wxHashTable::DoCopy(const wxHashTable& table)
|
||||
{
|
||||
n = table.n;
|
||||
m_count = table.m_count;
|
||||
current_position = table.current_position;
|
||||
current_node = NULL; // doesn't matter - Next() will reconstruct it
|
||||
key_type = table.key_type;
|
||||
|
Loading…
Reference in New Issue
Block a user