Changes for the embedded sample to build on Linux

Swigged updates for wxGTK

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

diff --git a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
index b0410dfdb566b4b2c12712a2f4957628f15c0709..9131be07ce7eada3e2db9ac297463e72aa42f511 100644 (file)
--- a/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
+++ b/wxPython/contrib/glcanvas/gtk/glcanvas.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "glcanvasc"
 
 
 #define SWIG_name    "glcanvasc"
 

-#include "export.h"
+#include "wxPython.h"

 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else
 #ifdef __WXMSW__
 #include "myglcanvas.h"
 #else

diff --git a/wxPython/contrib/stc/gtk/stc_.cpp b/wxPython/contrib/stc/gtk/stc_.cpp
index 812318ba9cad78f7f3a3f89641c235c25c5cf5f1..37013bbac2f0b50bfd12de384ceda543e81d9708 100644 (file)
--- a/wxPython/contrib/stc/gtk/stc_.cpp
+++ b/wxPython/contrib/stc/gtk/stc_.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "stc_c"
 
 
 #define SWIG_name    "stc_c"
 

-#include "export.h"
+#include "wxPython.h"

 #include "wx/stc/stc.h"
 
 
 #include "wx/stc/stc.h"
 
 

diff --git a/wxPython/samples/embedded/.cvsignore b/wxPython/samples/embedded/.cvsignore
index c2ebffa0911b40661aca2ece59b7a9586186c0b4..74070d84d941b4f74d36ec1297fe8ecd58ce1b54 100644 (file)
--- a/wxPython/samples/embedded/.cvsignore
+++ b/wxPython/samples/embedded/.cvsignore
@@ -1 +1,2 @@
+embedded

 embedded.dsp
 embedded.dsp

diff --git a/wxPython/samples/embedded/embedded.cpp b/wxPython/samples/embedded/embedded.cpp
index 73a79512c9d1e65d9ac66dc61a2dae89faf876df..4683cf2bafcbca07264f82dcd8d3e1406a0a797c 100644 (file)
--- a/wxPython/samples/embedded/embedded.cpp
+++ b/wxPython/samples/embedded/embedded.cpp
@@ -108,8 +108,8 @@ enum
 
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

-    EVT_MENU(ID_EXIT,      OnExit)
-    EVT_MENU(ID_PYFRAME,   OnPyFrame)
+    EVT_MENU(ID_EXIT,      MyFrame::OnExit)
+    EVT_MENU(ID_PYFRAME,   MyFrame::OnPyFrame)

 END_EVENT_TABLE()
 
 
 END_EVENT_TABLE()
 
 

diff --git a/wxPython/samples/embedded/makefile.unx b/wxPython/samples/embedded/makefile.unx
index ab17be9ca02e730492e2ab41b2a8e1b7d5bd59c4..df4f369f9effeabe2e08a50a92e403cdd8e6db4b 100644 (file)
--- a/wxPython/samples/embedded/makefile.unx
+++ b/wxPython/samples/embedded/makefile.unx
@@ -12,18 +12,20 @@
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 
 PROGRAM = embedded
 OBJECTS = $(PROGRAM).o
 

+EXTRAINC=-I../../src -I/usr/include/python2.2
+EXTRALIB=-L/usr/lib/python2.2/config -lpython2.2

 CXX = $(shell wx-config --cxx)
 
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :
 CXX = $(shell wx-config --cxx)
 
 
 .SUFFIXES:     .o .cpp
 
 .cpp.o :

-       $(CXX) -c `wx-config --cxxflags` -o $@ $<
+       $(CXX) -c `wx-config --cxxflags` $(EXTRAINC) -o $@ $<

 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)
 
 all:    $(PROGRAM)
 
 $(PROGRAM):    $(OBJECTS)

-       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
+       $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(EXTRALIB)

 
 clean:
        rm -f *.o $(PROGRAM)
 
 clean:
        rm -f *.o $(PROGRAM)

diff --git a/wxPython/src/gtk/calendar.cpp b/wxPython/src/gtk/calendar.cpp
index 42f7ca51b484bc0f2a3348ec3f3db24e8e43e199..2251d3f2f4d0e7767edde0a6fbcc397059147bff 100644 (file)
--- a/wxPython/src/gtk/calendar.cpp
+++ b/wxPython/src/gtk/calendar.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "calendarc"
 
 
 #define SWIG_name    "calendarc"
 

-#include "export.h"
+#include "wxPython.h"

 #include <wx/calctrl.h>
 
 
 #include <wx/calctrl.h>
 
 

diff --git a/wxPython/src/gtk/grid.cpp b/wxPython/src/gtk/grid.cpp
index 23660e27460eb78f616174b2b5878942251a1817..8285f417b9767f5f8489b12c574a0e63449b7158 100644 (file)
--- a/wxPython/src/gtk/grid.cpp
+++ b/wxPython/src/gtk/grid.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "gridc"
 
 
 #define SWIG_name    "gridc"
 

-#include "export.h"
+#include "wxPython.h"

 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 
 #include <wx/grid.h>
 #include <wx/generic/gridctrl.h>
 

diff --git a/wxPython/src/gtk/help.cpp b/wxPython/src/gtk/help.cpp
index 0a34f441a7d4e7b38f65dc7f6b2099630ee8a10a..987adc95a27eccb3559a38e96e3890de59bc904d 100644 (file)
--- a/wxPython/src/gtk/help.cpp
+++ b/wxPython/src/gtk/help.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "helpc"
 
 
 #define SWIG_name    "helpc"
 

-#include "export.h"
+#include "wxPython.h"

 #include <wx/cshelp.h>
 
 
 #include <wx/cshelp.h>
 
 

diff --git a/wxPython/src/gtk/html.cpp b/wxPython/src/gtk/html.cpp
index a92126552f84b56be29b5159b770b770613d5289..1c8f38e178f6c12a91284c43248e2fe86fc19c7c 100644 (file)
--- a/wxPython/src/gtk/html.cpp
+++ b/wxPython/src/gtk/html.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlc"
 
 
 #define SWIG_name    "htmlc"
 

-#include "export.h"
+#include "wxPython.h"

 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>
 #include <wx/html/htmlwin.h>
 #include <wx/html/htmprint.h>
 #include <wx/image.h>

diff --git a/wxPython/src/gtk/htmlhelp.cpp b/wxPython/src/gtk/htmlhelp.cpp
index 788c79e27f419921d2064906ce8b5652c774018a..263c8eef25dbc3747c1e308041c6bcb8270a31b2 100644 (file)
--- a/wxPython/src/gtk/htmlhelp.cpp
+++ b/wxPython/src/gtk/htmlhelp.cpp
@@ -55,7 +55,7 @@ extern PyObject *SWIG_newvarlink(void);
 
 #define SWIG_name    "htmlhelpc"
 
 
 #define SWIG_name    "htmlhelpc"
 

-#include "export.h"
+#include "wxPython.h"

 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>
 #include <wx/html/htmlwin.h>
 #include <wx/html/helpctrl.h>
 #include <wx/image.h>

diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp
index 51a9199a2fc88feea23b2686552259b38a641c0c..1566a70510fd50a08b768f67f75b905ac36bf573 100644 (file)
--- a/wxPython/src/gtk/wx.cpp
+++ b/wxPython/src/gtk/wx.cpp
@@ -596,7 +596,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
 
     wxPyApp* wxGetApp() {
         //return wxPythonApp;
 
     wxPyApp* wxGetApp() {
         //return wxPythonApp;

-        return (wxPyApp*)wxGetApp();
+        return (wxPyApp*)wxTheApp;

     }
 
     void wxApp_CleanUp() {
     }
 
     void wxApp_CleanUp() {