Fixed property list OnClose problem that caused Dialog Editor problem

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

diff --git a/distrib/msw/user.rsp b/distrib/msw/user.rsp
new file mode 100644 (file)
index 0000000..f9908ff
--- /dev/null
+++ b/distrib/msw/user.rsp
@@ -0,0 +1,27 @@
+user/Makefile
+
+user/wxConvert/*.cpp
+user/wxConvert/*.h
+user/wxConvert/Makefile
+user/wxConvert/Makefile.in
+
+user/wxFile/*.cpp
+user/wxFile/*.h
+user/wxFile/Makefile
+user/wxFile/Makefile.in
+user/wxFile/*.xpm
+
+user/wxTest/*.cpp
+user/wxTest/*.h
+user/wxTest/Makefile
+user/wxTest/Makefile.in
+user/wxTest/*.xpm
+user/wxTest/*.png
+
+user/wxLayout/*.cpp
+user/wxLayout/*.h
+user/wxLayout/Makefile
+user/wxLayout/Makefile.in
+user/wxLayout/*.xpm
+user/wxLayout/*.png
+

diff --git a/distrib/msw/wxtree.rsp b/distrib/msw/wxtree.rsp
new file mode 100644 (file)
index 0000000..c84c1fa
--- /dev/null
+++ b/distrib/msw/wxtree.rsp
@@ -0,0 +1,10 @@
+utils/wxtree/src/*.cpp
+utils/wxtree/src/*.h
+utils/wxtree/src/makefile*
+utils/wxtree/src/*.xbm
+utils/wxtree/src/*.xpm
+utils/wxtree/lib/dummy
+utils/wxtree/src/*.ico
+utils/wxtree/src/*.def
+utils/wxtree/src/*.rc
+

diff --git a/samples/sashtest/sashtest.def b/samples/sashtest/sashtest.def
new file mode 100644 (file)
index 0000000..f323e40
--- /dev/null
+++ b/samples/sashtest/sashtest.def
@@ -0,0 +1,9 @@
+      *   Last change:  JS    8 Sep 98    9:19 pm
+NAME         SashTest
+DESCRIPTION  'wxSashWindow Demo'
+EXETYPE      WINDOWS
+STUB         'WINSTUB.EXE'
+CODE         PRELOAD MOVEABLE DISCARDABLE
+DATA         PRELOAD MOVEABLE MULTIPLE
+HEAPSIZE     4048
+STACKSIZE    16000

diff --git a/samples/wxsocket/makefile.vc b/samples/wxsocket/makefile.vc
new file mode 100644 (file)
index 0000000..3864d7d
--- /dev/null
+++ b/samples/wxsocket/makefile.vc
@@ -0,0 +1,20 @@
+#
+# File:                makefile.vc
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:   (c) Julian Smart
+#
+# Makefile : Builds sample (VC++, WIN32)
+# Use FINAL=1 argument to nmake to build final version with no debug info.
+
+!include $(WXWIN)/src/makevc.env
+
+all:
+    nmake -f server.vc FINAL=$(FINAL)
+    nmake -f client.vc FINAL=$(FINAL)
+
+clean:
+    nmake -f server.vc clean
+    nmake -f client.vc clean
+

diff --git a/src/generic/proplist.cpp b/src/generic/proplist.cpp
index d9256c35c8381206814d96e0fb3f21227c792d7a..6f7fdd1a388f27916b00a1b0939704d83d538b8f 100644 (file)
--- a/src/generic/proplist.cpp
+++ b/src/generic/proplist.cpp
@@ -1713,7 +1713,7 @@ class wxPropertyStringListEditorDialog: public wxDialog
       m_currentSelection = -1;
     }
     ~wxPropertyStringListEditorDialog(void) {}
-    bool OnClose(void);
+    void OnCloseWindow(wxCloseEvent& event);
     void SaveCurrentSelection(void);
     void ShowCurrentSelection(void);
 
@@ -1745,6 +1745,7 @@ BEGIN_EVENT_TABLE(wxPropertyStringListEditorDialog, wxDialog)
     EVT_BUTTON(wxID_PROP_SL_DELETE,            wxPropertyStringListEditorDialog::OnDelete)
     EVT_LISTBOX(wxID_PROP_SL_STRINGS,  wxPropertyStringListEditorDialog::OnStrings)
     EVT_TEXT_ENTER(wxID_PROP_SL_TEXT,                  wxPropertyStringListEditorDialog::OnText)
+    EVT_CLOSE(wxPropertyStringListEditorDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
 class wxPropertyStringListEditorText: public wxTextCtrl
@@ -1905,14 +1906,16 @@ void wxPropertyStringListEditorDialog::OnOK(wxCommandEvent& WXUNUSED(event))
 {
   SaveCurrentSelection();
   EndModal(wxID_OK);
-  Close(TRUE);
+  // Close(TRUE);
+  this->Destroy();
 }
 
 void wxPropertyStringListEditorDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
   sm_dialogCancelled = TRUE;
   EndModal(wxID_CANCEL);
-  Close(TRUE);
+//  Close(TRUE);
+  this->Destroy();
 }
 
 void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
@@ -1923,10 +1926,10 @@ void wxPropertyStringListEditorDialog::OnText(wxCommandEvent& event)
   }
 }
 
-bool wxPropertyStringListEditorDialog::OnClose(void)
+void wxPropertyStringListEditorDialog::OnCloseWindow(wxCloseEvent& event)
 {
   SaveCurrentSelection();
-  return TRUE;
+  this->Destroy();
 }
 
 void wxPropertyStringListEditorDialog::SaveCurrentSelection(void)

diff --git a/src/png/makefile.b32 b/src/png/makefile.b32
new file mode 100644 (file)
index 0000000..6401e0a
--- /dev/null
+++ b/src/png/makefile.b32
@@ -0,0 +1,85 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1993
+# Updated:     
+# Copyright:
+#
+# "%W% %G%"
+#
+# Makefile : Builds minimal example
+
+# WXWIN and BCCDIR are set by parent make
+
+WXDIR = $(WXWIN)
+!include $(WXDIR)\src\makeb32.env
+
+WINPNGLIB = ..\..\lib\winpng.lib
+
+WXLIBDIR = $(WXDIR)\lib
+WXINC = $(WXDIR)\include\msw
+WXLIB = $(WXLIBDIR)\wx32.lib 
+LIBS=$(WXLIB) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib cw32 import32 ole2w32
+
+!if "$(FINAL)" == "0"
+LINKFLAGS=/v /Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS= -v
+!else
+LINKFLAGS=/Tpe /L$(WXLIBDIR);$(BCCDIR)\lib
+OPT = -Od
+DEBUG_FLAGS =
+!endif
+CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG)
+
+OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
+ pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj \
+ pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
+
+all: $(WINPNGLIB)
+
+$(WINPNGLIB): $(OBJECTS) 
+        erase $(WINPNGLIB)
+       tlib $(WINPNGLIB) /P512 @&&!
+-+$(OBJECTS:.obj =.obj -+) 
+!
+
+.$(SRCSUFF).obj:
+       bcc32 $(CPPFLAGS) -c {$< }
+
+.c.obj:
+       bcc32 $(CPPFLAGS) -P- -c {$< }
+
+$(CFG): makefile.b32
+       copy &&!
+-3
+-P
+-d
+-w-hid
+-w-par
+-w-pia
+-w-aus
+-w-rch
+-Oxt
+-WE
+
+-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
+-I$(WXDIR)\include\wx\msw\gnuwin32
+
+-L$(BCCDIR)\lib
+-D__WXWIN__
+-D__WXMSW__
+-D__WINDOWS__
+-DWIN32
+$(OPT)
+$(DEBUG_FLAGS)
+$(WIN95FLAG)
+! $(CFG)
+
+clean:
+        -erase *.obj
+        -erase *.exe
+        -erase *.res
+        -erase *.map
+        -erase *.rws
+