BC++ updates, propery form fix, dialog fix

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

distrib/msw/tmake/b32.t

@@ -181,7 +181,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 	-erase $(LIBTARGET)
 	-erase $(WXLIBDIR)\wx.dll
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&!
+        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul

docs/latex/wx/variant.tex

@@ -45,7 +45,8 @@ Default constructor.
 
 Copy constructor.
 
-\func{}{wxVariant}{\param{const char*}{ value}, \param{const wxString\& }{name = ``"}}\\
+\func{}{wxVariant}{\param{const char*}{ value}, \param{const wxString\& }{name = ``"}}
+
 \func{}{wxVariant}{\param{const wxString\&}{ value}, \param{const wxString\& }{name = ``"}}
 
 Construction from a string value.

include/wx/propform.h

@@ -281,6 +281,8 @@ public:
 
     // Extend event processing to search the view's event table
     virtual bool ProcessEvent(wxEvent& event);
+    void SetView(wxPropertyFormView* view) { m_view = view; }
+    wxPropertyFormView* GetView() const { return m_view; }
 
 private:
     wxPropertyFormView*       m_view;

src/generic/propform.cpp

@@ -164,6 +164,10 @@ bool wxPropertyFormView::AssociateNames(void)
 
 bool wxPropertyFormView::OnClose(void)
 {
+    if (m_propertyWindow->IsKindOf(CLASSINFO(wxPropertyFormPanel)))
+    {
+        ((wxPropertyFormPanel*)m_propertyWindow)->SetView(NULL);
+    }
     delete this;
     return TRUE;
 }

src/msw/dialog.cpp

@@ -329,14 +329,16 @@ void wxDialog::DoShowModal()
 
     wxWindow *parent = GetParent();
 
+    wxWindow* oldFocus = m_oldFocus;
+
     // inside this block, all app windows are disabled
     {
         wxWindowDisabler wd(this);
 
         // remember where the focus was
-        if ( !m_oldFocus )
+        if ( !oldFocus )
         {
-            m_oldFocus = parent;
+            oldFocus = parent;
         }
 
         // enter the modal loop
@@ -360,9 +362,12 @@ void wxDialog::DoShowModal()
 #endif // __WIN32__
 
     // and restore focus
-    if ( m_oldFocus && (m_oldFocus != this) )
+    // Note that this code MUST NOT access the dialog object's data
+    // in case the object has been deleted (which will be the case
+    // for a modal dialog that has been destroyed before calling EndModal).
+    if ( oldFocus && (oldFocus != this) )
     {
-        m_oldFocus->SetFocus();
+        oldFocus->SetFocus();
     }
 }
 

src/msw/makefile.b32

@@ -361,7 +361,7 @@ $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 $(LIBTARGET): $(DUMMY).obj $(OBJECTS)
 	-erase $(LIBTARGET)
 	-erase $(WXLIBDIR)\wx.dll
-        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR) /v @&&!
+        $(LINK) $(LINK_FLAGS) /L$(WXLIBDIR);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk /v @&&!
 c0d32.obj $(OBJECTS)
 $(WXLIBDIR)\wx
 nul