dllwidget demo updates

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

diff --git a/wxPython/demo/dllwidget/Makefile b/wxPython/demo/dllwidget/Makefile
index 71065ea605bb010faa1d0c22511ef86e12dd6e28..bcf3a56412c9b60ff0530ef88b490e74b4b8aa7f 100644 (file)
--- a/wxPython/demo/dllwidget/Makefile
+++ b/wxPython/demo/dllwidget/Makefile
@@ -4,10 +4,7 @@ CXXFLAGS = `wx-config --cxxflags` -fPIC -I.
 LDFLAGS = `wx-config --libs`
 
 
-all: test_prg test_dll.so
-
-test_prg: dllwidget.o test_prg.o
-       $(CXX) $(LDFLAGS) -o $@ dllwidget.o test_prg.o
+all: test_dll.so
 
 test_dll.so: test_dll.o
        $(CXX) $(LDFLAGS) -shared -o $@ $<
@@ -16,4 +13,4 @@ test_dll.so: test_dll.o
        $(CXX) -c $(CXXFLAGS) -o $@ $<
 
 clean:
-       rm -f *.o *.so test_prg
+       rm -f *.o *.so

diff --git a/wxPython/demo/dllwidget/test_dll.cpp b/wxPython/demo/dllwidget/test_dll.cpp
index 605d787a36254f51cfb39630fcf82edbb0801f69..0c2d92e16f0e87597fbd432c34f14177b54f0952 100644 (file)
--- a/wxPython/demo/dllwidget/test_dll.cpp
+++ b/wxPython/demo/dllwidget/test_dll.cpp
@@ -3,7 +3,7 @@
 #include <wx/window.h>
 #include <wx/msgdlg.h>
 
-#include "../dllwidget.h"
+#include "../../contrib/dllwidget/dllwidget.h"
 
 class TestWindow : public wxWindow
 {

diff --git a/wxPython/demo/dllwidget/test_prog.py b/wxPython/demo/dllwidget/test_prog.py
index 42991bd8fcd1384735acb2ae199882551a15c536..660b158c41a32af20a65c2e0e858d927c625543d 100644 (file)
--- a/wxPython/demo/dllwidget/test_prog.py
+++ b/wxPython/demo/dllwidget/test_prog.py
@@ -36,14 +36,16 @@ class TestFrame(wxFrame):
                                    "TestWindow",
                                    size=(250, 150))
 
-        # The embedded window is the one exported from the DLL
-        print dw.GetEmbeddedWindow().GetClassName()
-
-        # This shows that we can give it a child from this side of things.
-        # You can also call any wxWindow methods on it too.
-        wxStaticText(dw.GetEmbeddedWindow(), -1,
-                     "Loaded from test_dll...", pos=(10,10))
-
+        if dw.Ok():
+            # The embedded window is the one exported from the DLL
+            print dw.GetEmbeddedWindow().GetClassName()
+
+            # This shows that we can give it a child from this side of things.
+            # You can also call any wxWindow methods on it too.
+            wxStaticText(dw.GetEmbeddedWindow(), -1,
+                         "Loaded from test_dll...", pos=(10,10))
+        else:
+            wxStaticText(dw, -1, "ERROR!!!!", pos=(20,20))
 
         sizer = wxBoxSizer(wxVERTICAL)
         sizer.Add(wxStaticLine(panel, -1), 0, wxGROW)