dllwidget demo updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,10 +4,7 @@ CXXFLAGS = `wx-config --cxxflags` -fPIC -I.
|
|||||||
LDFLAGS = `wx-config --libs`
|
LDFLAGS = `wx-config --libs`
|
||||||
|
|
||||||
|
|
||||||
all: test_prg test_dll.so
|
all: test_dll.so
|
||||||
|
|
||||||
test_prg: dllwidget.o test_prg.o
|
|
||||||
$(CXX) $(LDFLAGS) -o $@ dllwidget.o test_prg.o
|
|
||||||
|
|
||||||
test_dll.so: test_dll.o
|
test_dll.so: test_dll.o
|
||||||
$(CXX) $(LDFLAGS) -shared -o $@ $<
|
$(CXX) $(LDFLAGS) -shared -o $@ $<
|
||||||
@@ -16,4 +13,4 @@ test_dll.so: test_dll.o
|
|||||||
$(CXX) -c $(CXXFLAGS) -o $@ $<
|
$(CXX) -c $(CXXFLAGS) -o $@ $<
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o *.so test_prg
|
rm -f *.o *.so
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
#include <wx/window.h>
|
#include <wx/window.h>
|
||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
|
|
||||||
#include "../dllwidget.h"
|
#include "../../contrib/dllwidget/dllwidget.h"
|
||||||
|
|
||||||
class TestWindow : public wxWindow
|
class TestWindow : public wxWindow
|
||||||
{
|
{
|
||||||
|
@@ -36,6 +36,7 @@ class TestFrame(wxFrame):
|
|||||||
"TestWindow",
|
"TestWindow",
|
||||||
size=(250, 150))
|
size=(250, 150))
|
||||||
|
|
||||||
|
if dw.Ok():
|
||||||
# The embedded window is the one exported from the DLL
|
# The embedded window is the one exported from the DLL
|
||||||
print dw.GetEmbeddedWindow().GetClassName()
|
print dw.GetEmbeddedWindow().GetClassName()
|
||||||
|
|
||||||
@@ -43,7 +44,8 @@ class TestFrame(wxFrame):
|
|||||||
# You can also call any wxWindow methods on it too.
|
# You can also call any wxWindow methods on it too.
|
||||||
wxStaticText(dw.GetEmbeddedWindow(), -1,
|
wxStaticText(dw.GetEmbeddedWindow(), -1,
|
||||||
"Loaded from test_dll...", pos=(10,10))
|
"Loaded from test_dll...", pos=(10,10))
|
||||||
|
else:
|
||||||
|
wxStaticText(dw, -1, "ERROR!!!!", pos=(20,20))
|
||||||
|
|
||||||
sizer = wxBoxSizer(wxVERTICAL)
|
sizer = wxBoxSizer(wxVERTICAL)
|
||||||
sizer.Add(wxStaticLine(panel, -1), 0, wxGROW)
|
sizer.Add(wxStaticLine(panel, -1), 0, wxGROW)
|
||||||
|
Reference in New Issue
Block a user