Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for the embedded sample to build on Linux

Browse Source 
Swigged updates for wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-05-02 06:18:39 +00:00
parent a24268437f
commit 5d26a7e65f
11 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/glcanvas/gtk/glcanvas.cpp
View File

@@ -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__ #ifdef __WXMSW__
#include "myglcanvas.h" #include "myglcanvas.h"
#else #else

2
wxPython/contrib/stc/gtk/stc_.cpp
View File

@@ -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"

1
wxPython/samples/embedded/.cvsignore
View File

@@ -1 +1,2 @@
embedded
embedded.dsp embedded.dsp

4
wxPython/samples/embedded/embedded.cpp
View File

@@ -108,8 +108,8 @@ enum
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ID_EXIT, OnExit) EVT_MENU(ID_EXIT, MyFrame::OnExit)
EVT_MENU(ID_PYFRAME, OnPyFrame) EVT_MENU(ID_PYFRAME, MyFrame::OnPyFrame)
END_EVENT_TABLE() END_EVENT_TABLE()

6
wxPython/samples/embedded/makefile.unx
View File

@@ -12,18 +12,20 @@
PROGRAM = embedded PROGRAM = embedded
OBJECTS = $(PROGRAM).o 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) CXX = $(shell wx-config --cxx)
.SUFFIXES: .o .cpp .SUFFIXES: .o .cpp
.cpp.o : .cpp.o :
$(CXX) -c `wx-config --cxxflags` -o $@ $< $(CXX) -c `wx-config --cxxflags` $(EXTRAINC) -o $@ $<
all: $(PROGRAM) all: $(PROGRAM)
$(PROGRAM): $(OBJECTS) $(PROGRAM): $(OBJECTS)
$(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(CXX) -o $(PROGRAM) $(OBJECTS) `wx-config --libs` $(EXTRALIB)
clean: clean:
rm -f *.o $(PROGRAM) rm -f *.o $(PROGRAM)

2
wxPython/src/gtk/calendar.cpp
View File

@@ -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>

2
wxPython/src/gtk/grid.cpp
View File

@@ -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/grid.h>
#include <wx/generic/gridctrl.h> #include <wx/generic/gridctrl.h>

2
wxPython/src/gtk/help.cpp
View File

@@ -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>

2
wxPython/src/gtk/html.cpp
View File

@@ -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/htmlwin.h>
#include <wx/html/htmprint.h> #include <wx/html/htmprint.h>
#include <wx/image.h> #include <wx/image.h>

2
wxPython/src/gtk/htmlhelp.cpp
View File

@@ -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/htmlwin.h>
#include <wx/html/helpctrl.h> #include <wx/html/helpctrl.h>
#include <wx/image.h> #include <wx/image.h>

2
wxPython/src/gtk/wx.cpp
View File

@@ -596,7 +596,7 @@ PyObject *ptrfree(PyObject *_PTRVALUE) {
wxPyApp* wxGetApp() { wxPyApp* wxGetApp() {
//return wxPythonApp; //return wxPythonApp;
return (wxPyApp*)wxGetApp(); return (wxPyApp*)wxTheApp;
} }
void wxApp_CleanUp() { void wxApp_CleanUp() {