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

wxPython updates to match recent updates to wxCalendarCtrl, wxGrid,

Browse Source 
and wxGLCanvas.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-11-02 20:56:23 +00:00
parent eb5420bf25
commit ab11ebfa19
10 changed files with 339 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/glcanvas/glcanvas.i
View File

@@ -94,7 +94,7 @@ public:
class wxGLCanvas : public wxScrolledWindow {
class wxGLCanvas : public wxWindow {
public:
wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,

18
wxPython/contrib/glcanvas/msw/glcanvas.cpp
View File

@@ -288,22 +288,6 @@ static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static void *SwigwxGLCanvasTowxScrolledWindow(void *ptr) {
wxGLCanvas *src;
wxScrolledWindow *dest;
src = (wxGLCanvas *) ptr;
dest = (wxScrolledWindow *) src;
return (void *) dest;
}
static void *SwigwxGLCanvasTowxPanel(void *ptr) {
wxGLCanvas *src;
wxPanel *dest;
src = (wxGLCanvas *) ptr;
dest = (wxPanel *) src;
return (void *) dest;
}
static void *SwigwxGLCanvasTowxWindow(void *ptr) {
wxGLCanvas *src;
wxWindow *dest;
@@ -810,7 +794,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_wxPanel","_wxGLCanvas",SwigwxGLCanvasTowxPanel},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_time_t",0},
@@ -844,7 +827,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxGLContext",SwigwxGLContextTowxObject},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxScrolledWindow","_wxGLCanvas",SwigwxGLCanvasTowxScrolledWindow},
{ "_unsigned_char","_byte",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},

2
wxPython/contrib/glcanvas/msw/glcanvas.py
View File

@@ -70,7 +70,7 @@ class wxGLContext(wxGLContextPtr):
class wxGLCanvasPtr(wxScrolledWindowPtr):
class wxGLCanvasPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0

10
wxPython/contrib/glcanvas/msw/myglcanvas.cpp
View File

@@ -128,9 +128,9 @@ void wxGLContext::SetColour(const char *colour)
* wxGLCanvas implementation
*/
IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow)
IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
BEGIN_EVENT_TABLE(wxGLCanvas, wxScrolledWindow)
BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
EVT_SIZE(wxGLCanvas::OnSize)
EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged)
EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette)
@@ -138,7 +138,7 @@ END_EVENT_TABLE()
wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList, const wxPalette& palette) : wxScrolledWindow()
int *attribList, const wxPalette& palette) : wxWindow()
{
m_glContext = (wxGLContext*) NULL;
@@ -162,7 +162,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
const wxGLContext *shared, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList, const wxPalette& palette )
: wxScrolledWindow()
: wxWindow()
{
m_glContext = (wxGLContext*) NULL;
@@ -187,7 +187,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id,
const wxPoint& pos, const wxSize& size, long style, const wxString& name,
int *attribList, const wxPalette& palette ):
wxScrolledWindow()
wxWindow()
{
m_glContext = (wxGLContext*) NULL;

5
wxPython/contrib/glcanvas/msw/myglcanvas.h
View File

@@ -19,7 +19,6 @@
#include <wx/setup.h>
#undef wxUSE_GLCANVAS
#define wxUSE_GLCANVAS 1
#if wxUSE_GLCANVAS
#include <wx/palette.h>
#include <wx/scrolwin.h>
@@ -84,7 +83,7 @@ public:
wxWindow* m_window;
};
class wxGLCanvas: public wxScrolledWindow
class wxGLCanvas: public wxWindow
{
DECLARE_CLASS(wxGLCanvas)
public:
@@ -152,8 +151,6 @@ private:
#endif
// wxUSE_GLCANVAS
#endif
// _WX_GLCANVAS_H_