- Moved the header in the .i files out of the code that gets put into

the .cpp files.  It caused CVS conflicts because of the RCS ID being
different each time.

- A few minor fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 1998-08-15 07:36:54 +00:00
parent 34138703c3
commit 03e9bead8a
24 changed files with 1694 additions and 219 deletions

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "cmndlgsc"
/////////////////////////////////////////////////////////////////////////////
// Name: cmndlgs.i
// Purpose: SWIG definitions for the Common Dialog Classes
//
// Author: Robin Dunn
//
// Created: 7/25/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/colordlg.h>
#include <wx/dirdlg.h>
@ -125,7 +112,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module cmndlgs
%{
/////////////////////////////////////////////////////////////////////////////
// Name: cmndlgs.i
// Purpose: SWIG definitions for the Common Dialog Classes
@ -12,7 +10,9 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module cmndlgs
%{
#include "helpers.h"
#include <wx/colordlg.h>
#include <wx/dirdlg.h>
@ -286,6 +286,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:25 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:49 RD
// Initial version
//

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "controlsc"
/////////////////////////////////////////////////////////////////////////////
// Name: controls.i
// Purpose: Control (widget) classes for wxPython
//
// Author: Robin Dunn
//
// Created: 6/10/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/slider.h>
#include <wx/spinbutt.h>
@ -123,7 +110,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module controls
%{
/////////////////////////////////////////////////////////////////////////////
// Name: controls.i
// Purpose: Control (widget) classes for wxPython
@ -12,7 +10,9 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module controls
%{
#include "helpers.h"
#include <wx/slider.h>
#include <wx/spinbutt.h>
@ -419,6 +419,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:28 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:49 RD
// Initial version
//

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "controls2c"
/////////////////////////////////////////////////////////////////////////////
// Name: controls2.i
// Purpose: More control (widget) classes for wxPython
//
// Author: Robin Dunn
//
// Created: 6/10/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/listctrl.h>
#include <wx/treectrl.h>
@ -124,7 +111,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module controls2
%{
/////////////////////////////////////////////////////////////////////////////
// Name: controls2.i
// Purpose: More control (widget) classes for wxPython
@ -12,7 +10,9 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module controls2
%{
#include "helpers.h"
#include <wx/listctrl.h>
#include <wx/treectrl.h>
@ -375,6 +375,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:30 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:49 RD
// Initial version
//

View File

@ -53,30 +53,16 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "eventsc"
/////////////////////////////////////////////////////////////////////////////
// Name: events.i
// Purpose: SWIGgable Event classes for wxPython
//
// Author: Robin Dunn
//
// Created: 5/24/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
@ -93,23 +79,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyTuple_Check(target)) {
o2 = target;
target = PyTuple_New(1);
PyTuple_SetItem(target, 0, o2);
}
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o2 = target;
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
Py_DECREF(o3);
}
return target;

View File

@ -1,5 +1,3 @@
%module events
%{
/////////////////////////////////////////////////////////////////////////////
// Name: events.i
// Purpose: SWIGgable Event classes for wxPython
@ -13,6 +11,9 @@
/////////////////////////////////////////////////////////////////////////////
%module events
%{
#include "helpers.h"
%}
@ -288,6 +289,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:33 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:50 RD
// Initial version
//

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "gdic"
/////////////////////////////////////////////////////////////////////////////
// Name: gdi.i
// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc.
//
// Author: Robin Dunn
//
// Created: 7/7/97
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/metafile.h>
@ -123,7 +110,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module gdi
%{
/////////////////////////////////////////////////////////////////////////////
// Name: gdi.i
// Purpose: SWIG interface file for wxDC, wxBrush, wxPen, wxFont, etc.
@ -13,6 +11,9 @@
/////////////////////////////////////////////////////////////////////////////
%module gdi
%{
#include "helpers.h"
#include <wx/metafile.h>
@ -460,6 +461,13 @@ extern wxColour wxNullColour;
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:35 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:50 RD
// Initial version
//

View File

@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: helpers.cpp
// Purpose: Helper functions/classes for the wxPython extenaion module
// Purpose: Helper functions/classes for the wxPython extension module
//
// Author: Robin Dunn
//
@ -1060,6 +1060,13 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.3 1998/08/15 07:36:36 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.2 1998/08/14 23:36:36 RD
// Beginings of wxGTK compatibility
//

View File

@ -38,7 +38,7 @@ EXTRALIBS=$(PYTHONDIR)\libs\python15.lib
EXTRAINC=-I$(PYTHONDIR)\include
EXTRAFLAGS=/Fpwxp.pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H
SWIGFLAGS=-c++ -shadow -python -dnone
SWIGFLAGS=-c++ -shadow -python -dnone -D__WXMSW__
!include $(WXDIR)\src\ntwxwin.mak
@ -185,6 +185,13 @@ $(TARGETDIR)\cmndlgs.py : cmndlgs.py
#------------------------------------------------------------------------
#
# $Log$
# Revision 1.3 1998/08/15 07:36:37 RD
# - Moved the header in the .i files out of the code that gets put into
# the .cpp files. It caused CVS conflicts because of the RCS ID being
# different each time.
#
# - A few minor fixes.
#
# Revision 1.2 1998/08/14 03:34:23 RD
# made pre-compiling the python files optional
#

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "mdic"
/////////////////////////////////////////////////////////////////////////////
// Name: mdi.i
// Purpose: MDI related class definitions for wxPython
//
// Author: Robin Dunn
//
// Created: 5/26/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
@ -121,7 +108,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module mdi
%{
/////////////////////////////////////////////////////////////////////////////
// Name: mdi.i
// Purpose: MDI related class definitions for wxPython
@ -13,6 +11,9 @@
/////////////////////////////////////////////////////////////////////////////
%module mdi
%{
#include "helpers.h"
%}
@ -83,6 +84,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:39 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:51 RD
// Initial version
//

View File

@ -53,31 +53,17 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "miscc"
/////////////////////////////////////////////////////////////////////////////
// Name: misc.i
// Purpose: Definitions of miscelaneous functions and classes
//
// Author: Robin Dunn
//
// Created: 7/3/97
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/resource.h>
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
@ -94,23 +80,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyTuple_Check(target)) {
o2 = target;
target = PyTuple_New(1);
PyTuple_SetItem(target, 0, o2);
}
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o2 = target;
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
Py_DECREF(o3);
}
return target;

View File

@ -1,5 +1,3 @@
%module misc
%{
/////////////////////////////////////////////////////////////////////////////
// Name: misc.i
// Purpose: Definitions of miscelaneous functions and classes
@ -12,7 +10,9 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module misc
%{
#include "helpers.h"
#include <wx/resource.h>
%}
@ -301,6 +301,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:41 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:51 RD
// Initial version
//

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,3 @@
%module windows
%{
/////////////////////////////////////////////////////////////////////////////
// Name: windows.i
// Purpose: SWIG definitions of various window classes
@ -13,6 +11,9 @@
/////////////////////////////////////////////////////////////////////////////
%module windows
%{
#include "helpers.h"
#ifdef __WXMSW__
@ -404,6 +405,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.3 1998/08/15 07:36:47 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.2 1998/08/14 23:36:46 RD
// Beginings of wxGTK compatibility
//

View File

@ -42,6 +42,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def DestroyChildren(self):
val = windowsc.wxWindow_DestroyChildren(self.this)
return val
def DragAcceptFiles(self,arg0):
val = windowsc.wxWindow_DragAcceptFiles(self.this,arg0)
return val
def Enable(self,arg0):
val = windowsc.wxWindow_Enable(self.this,arg0)
return val
@ -53,6 +56,12 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = wxColourPtr(val)
val.thisown = 1
return val
def GetCharHeight(self):
val = windowsc.wxWindow_GetCharHeight(self.this)
return val
def GetCharWidth(self):
val = windowsc.wxWindow_GetCharWidth(self.this)
return val
def GetClientSize(self):
val = windowsc.wxWindow_GetClientSize(self.this)
return val
@ -60,10 +69,23 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = windowsc.wxWindow_GetConstraints(self.this)
val = wxLayoutConstraintsPtr(val)
return val
def GetDefaultItem(self):
val = windowsc.wxWindow_GetDefaultItem(self.this)
val = wxButtonPtr(val)
return val
def GetFont(self):
val = windowsc.wxWindow_GetFont(self.this)
val = wxFontPtr(val)
return val
def GetForegroundColour(self):
val = windowsc.wxWindow_GetForegroundColour(self.this)
val = wxColourPtr(val)
val.thisown = 1
return val
def GetGrandParent(self):
val = windowsc.wxWindow_GetGrandParent(self.this)
val = wxWindowPtr(val)
return val
def GetId(self):
val = windowsc.wxWindow_GetId(self.this)
return val
@ -95,6 +117,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetSize(self):
val = windowsc.wxWindow_GetSize(self.this)
return val
def GetTextExtent(self,arg0):
val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
return val
def GetTitle(self):
val = windowsc.wxWindow_GetTitle(self.this)
return val
@ -116,6 +141,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def Layout(self):
val = windowsc.wxWindow_Layout(self.this)
return val
def LoadFromResource(self,arg0,arg1,*args):
val = apply(windowsc.wxWindow_LoadFromResource,(self.this,arg0.this,arg1,)+args)
return val
def Lower(self):
val = windowsc.wxWindow_Lower(self.this)
return val
@ -169,6 +197,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def SetFont(self,arg0):
val = windowsc.wxWindow_SetFont(self.this,arg0.this)
return val
def SetForegroundColour(self,arg0):
val = windowsc.wxWindow_SetForegroundColour(self.this,arg0.this)
return val
def SetId(self,arg0):
val = windowsc.wxWindow_SetId(self.this,arg0)
return val
@ -193,6 +224,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def SetPosition(self,arg0):
val = windowsc.wxWindow_SetPosition(self.this,arg0.this)
return val
def SetSizeHints(self,*args):
val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args)
return val
def SetClientSize(self,arg0,arg1):
val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1)
return val
@ -214,6 +248,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
def Validate(self):
val = windowsc.wxWindow_Validate(self.this)
return val
def WarpPointer(self,arg0,arg1):
val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1)
return val
def __repr__(self):
return "<C wxWindow instance>"
class wxWindow(wxWindowPtr):
@ -237,6 +274,9 @@ class wxFramePtr(wxWindowPtr):
def Centre(self,*args):
val = apply(windowsc.wxFrame_Centre,(self.this,)+args)
return val
def Command(self,arg0):
val = windowsc.wxFrame_Command(self.this,arg0)
return val
def CreateStatusBar(self,*args):
val = apply(windowsc.wxFrame_CreateStatusBar,(self.this,)+args)
return val
@ -250,6 +290,18 @@ class wxFramePtr(wxWindowPtr):
def GetTitle(self):
val = windowsc.wxFrame_GetTitle(self.this)
return val
def Iconize(self,arg0):
val = windowsc.wxFrame_Iconize(self.this,arg0)
return val
def IsIconized(self):
val = windowsc.wxFrame_IsIconized(self.this)
return val
def SetAcceleratorTable(self,arg0):
val = windowsc.wxFrame_SetAcceleratorTable(self.this,arg0.this)
return val
def Maximize(self,arg0):
val = windowsc.wxFrame_Maximize(self.this,arg0)
return val
def SetIcon(self,arg0):
val = windowsc.wxFrame_SetIcon(self.this,arg0.this)
return val
@ -281,6 +333,26 @@ class wxFrame(wxFramePtr):
class wxMiniFramePtr(wxFramePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxMiniFrame instance>"
class wxMiniFrame(wxMiniFramePtr):
def __init__(self,arg0,arg1,arg2,*args) :
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
try: argl[1] = argl[1].this
except: pass
args = tuple(argl)
self.this = apply(windowsc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
class wxPanelPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
@ -317,6 +389,15 @@ class wxDialogPtr(wxPanelPtr):
def GetTitle(self):
val = windowsc.wxDialog_GetTitle(self.this)
return val
def Iconize(self,arg0):
val = windowsc.wxDialog_Iconize(self.this,arg0)
return val
def IsIconized(self):
val = windowsc.wxDialog_IsIconized(self.this)
return val
def SetModal(self,arg0):
val = windowsc.wxDialog_SetModal(self.this,arg0)
return val
def IsModal(self):
val = windowsc.wxDialog_IsModal(self.this)
return val
@ -414,6 +495,25 @@ class wxMenuPtr(wxEvtHandlerPtr):
def FindItem(self,arg0):
val = windowsc.wxMenu_FindItem(self.this,arg0)
return val
def FindItemForId(self,arg0):
val = windowsc.wxMenu_FindItemForId(self.this,arg0)
val = wxMenuItemPtr(val)
return val
def GetHelpString(self,arg0):
val = windowsc.wxMenu_GetHelpString(self.this,arg0)
return val
def GetLabel(self,arg0):
val = windowsc.wxMenu_GetLabel(self.this,arg0)
return val
def GetTitle(self):
val = windowsc.wxMenu_GetTitle(self.this)
return val
def SetHelpString(self,arg0,arg1):
val = windowsc.wxMenu_SetHelpString(self.this,arg0,arg1)
return val
def SetTitle(self,arg0):
val = windowsc.wxMenu_SetTitle(self.this,arg0)
return val
def IsChecked(self,arg0):
val = windowsc.wxMenu_IsChecked(self.this,arg0)
return val
@ -433,6 +533,23 @@ class wxMenu(wxMenuPtr):
class wxPyMenuPtr(wxMenuPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
windowsc.delete_wxPyMenu(self.this)
def __repr__(self):
return "<C wxPyMenu instance>"
class wxPyMenu(wxPyMenuPtr):
def __init__(self,*args) :
self.this = apply(windowsc.new_wxPyMenu,()+args)
self.thisown = 1
class wxMenuBarPtr(wxEvtHandlerPtr):
def __init__(self,this):
self.this = this
@ -452,6 +569,31 @@ class wxMenuBarPtr(wxEvtHandlerPtr):
def FindMenuItem(self,arg0,arg1):
val = windowsc.wxMenuBar_FindMenuItem(self.this,arg0,arg1)
return val
def EnableTop(self,arg0,arg1):
val = windowsc.wxMenuBar_EnableTop(self.this,arg0,arg1)
return val
def FindItemForId(self,arg0):
val = windowsc.wxMenuBar_FindItemForId(self.this,arg0)
val = wxMenuItemPtr(val)
return val
def GetHelpString(self,arg0):
val = windowsc.wxMenuBar_GetHelpString(self.this,arg0)
return val
def GetLabel(self,arg0):
val = windowsc.wxMenuBar_GetLabel(self.this,arg0)
return val
def SetHelpString(self,arg0,arg1):
val = windowsc.wxMenuBar_SetHelpString(self.this,arg0,arg1)
return val
def SetLabel(self,arg0,arg1):
val = windowsc.wxMenuBar_SetLabel(self.this,arg0,arg1)
return val
def GetLabelTop(self,arg0):
val = windowsc.wxMenuBar_GetLabelTop(self.this,arg0)
return val
def SetLabelTop(self,arg0,arg1):
val = windowsc.wxMenuBar_SetLabelTop(self.this,arg0,arg1)
return val
def __repr__(self):
return "<C wxMenuBar instance>"
class wxMenuBar(wxMenuBarPtr):
@ -482,12 +624,27 @@ class wxMenuItemPtr :
val = windowsc.wxMenuItem_GetSubMenu(self.this)
val = wxMenuPtr(val)
return val
def GetHelp(self):
val = windowsc.wxMenuItem_GetHelp(self.this)
return val
def SetName(self,arg0):
val = windowsc.wxMenuItem_SetName(self.this,arg0)
return val
def SetHelp(self,arg0):
val = windowsc.wxMenuItem_SetHelp(self.this,arg0)
return val
def Enable(self,*args):
val = apply(windowsc.wxMenuItem_Enable,(self.this,)+args)
return val
def Check(self,*args):
val = apply(windowsc.wxMenuItem_Check,(self.this,)+args)
return val
def DeleteSubMenu(self):
val = windowsc.wxMenuItem_DeleteSubMenu(self.this)
return val
def GetName(self):
val = windowsc.wxMenuItem_GetName(self.this)
return val
def IsCheckable(self):
val = windowsc.wxMenuItem_IsCheckable(self.this)
return val
@ -504,6 +661,11 @@ class wxMenuItem(wxMenuItemPtr):
#-------------- FUNCTION WRAPPERS ------------------
def wxWindow_FindFocus():
val = windowsc.wxWindow_FindFocus()
val = wxWindowPtr(val)
return val
#-------------- VARIABLE WRAPPERS ------------------

View File

@ -53,19 +53,6 @@ extern PyObject *SWIG_newvarlink(void);
#define SWIG_name "windows2c"
/////////////////////////////////////////////////////////////////////////////
// Name: windows2.i
// Purpose: SWIG definitions of MORE window classes
//
// Author: Robin Dunn
//
// Created: 6/2/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "helpers.h"
#include <wx/grid.h>
#include <wx/notebook.h>
@ -123,7 +110,9 @@ extern char** string_LIST_helper(PyObject* source);
extern wxPoint* wxPoint_LIST_helper(PyObject* source);
extern wxBitmap** wxBitmap_LIST_helper(PyObject* source);
extern wxString* wxString_LIST_helper(PyObject* source);
#ifdef __WXMSW__
extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source);
#endif
static char* wxStringErrorMsg = "string type is required for parameter";

View File

@ -1,5 +1,3 @@
%module windows2
%{
/////////////////////////////////////////////////////////////////////////////
// Name: windows2.i
// Purpose: SWIG definitions of MORE window classes
@ -12,7 +10,9 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module windows2
%{
#include "helpers.h"
#include <wx/grid.h>
#include <wx/notebook.h>
@ -222,6 +222,13 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.2 1998/08/15 07:36:50 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.1 1998/08/09 08:25:52 RD
// Initial version
//

View File

@ -33,8 +33,12 @@
* and things like that.
*
* $Log$
* Revision 1.3 1998/08/14 23:36:47 RD
* Beginings of wxGTK compatibility
* Revision 1.4 1998/08/15 07:36:51 RD
* - Moved the header in the .i files out of the code that gets put into
* the .cpp files. It caused CVS conflicts because of the RCS ID being
* different each time.
*
* - A few minor fixes.
*
************************************************************************/
@ -556,18 +560,6 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
#define SWIG_name "wxpc"
/////////////////////////////////////////////////////////////////////////////
// Name: wxp.i
// Purpose: SWIG interface file for a python wxWindows module
//
// Author: Robin Dunn
//
// Created: 5/22/98
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __WXMSW__
#include <windows.h>
@ -581,13 +573,12 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
@ -604,23 +595,23 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
if (!target) {
target = o;
} else if (target == Py_None) {
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
} else {
if (!PyTuple_Check(target)) {
o2 = target;
target = PyTuple_New(1);
PyTuple_SetItem(target, 0, o2);
}
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o2 = target;
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
Py_DECREF(o3);
}
return target;
@ -748,6 +739,27 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxPyApp_GetAuto3D(_swigobj) (_swigobj->GetAuto3D())
static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxPyApp * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxPyApp_GetAuto3D",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetAuto3D. Expected _wxPyApp_p.");
return NULL;
}
}
_result = (bool )wxPyApp_GetAuto3D(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxPyApp_GetClassName(_swigobj) (_swigobj->GetClassName())
static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@ -1004,6 +1016,30 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxPyApp_SetAuto3D(_swigobj,_swigarg0) (_swigobj->SetAuto3D(_swigarg0))
static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPyApp * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxPyApp_SetAuto3D",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyApp_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_SetAuto3D. Expected _wxPyApp_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
wxPyApp_SetAuto3D(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxPyApp_SetClassName(_swigobj,_swigarg0) (_swigobj->SetClassName(_swigarg0))
static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@ -1175,6 +1211,7 @@ static PyMethodDef wxpcMethods[] = {
{ "wxPyApp_SetPrintMode", _wrap_wxPyApp_SetPrintMode, 1 },
{ "wxPyApp_SetExitOnFrameDelete", _wrap_wxPyApp_SetExitOnFrameDelete, 1 },
{ "wxPyApp_SetClassName", _wrap_wxPyApp_SetClassName, 1 },
{ "wxPyApp_SetAuto3D", _wrap_wxPyApp_SetAuto3D, 1 },
{ "wxPyApp_SetAppName", _wrap_wxPyApp_SetAppName, 1 },
{ "wxPyApp_Pending", _wrap_wxPyApp_Pending, 1 },
{ "wxPyApp_MainLoop", _wrap_wxPyApp_MainLoop, 1 },
@ -1186,6 +1223,7 @@ static PyMethodDef wxpcMethods[] = {
{ "wxPyApp_GetPrintMode", _wrap_wxPyApp_GetPrintMode, 1 },
{ "wxPyApp_GetExitOnFrameDelete", _wrap_wxPyApp_GetExitOnFrameDelete, 1 },
{ "wxPyApp_GetClassName", _wrap_wxPyApp_GetClassName, 1 },
{ "wxPyApp_GetAuto3D", _wrap_wxPyApp_GetAuto3D, 1 },
{ "wxPyApp_GetAppName", _wrap_wxPyApp_GetAppName, 1 },
{ "new_wxPyApp", _wrap_new_wxPyApp, 1 },
{ "_wxSetDictionary", __wxSetDictionary, 1 },
@ -1413,6 +1451,9 @@ SWIGEXPORT(void,initwxpc)() {
PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE));
PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY));
PyDict_SetItemString(d,"wxOVERWRITE_PROMPT", PyInt_FromLong((long) wxOVERWRITE_PROMPT));
PyDict_SetItemString(d,"wxACCEL_ALT", PyInt_FromLong((long) wxACCEL_ALT));
PyDict_SetItemString(d,"wxACCEL_CTRL", PyInt_FromLong((long) wxACCEL_CTRL));
PyDict_SetItemString(d,"wxACCEL_SHIFT", PyInt_FromLong((long) wxACCEL_SHIFT));
PyDict_SetItemString(d,"ERR_PARAM", PyInt_FromLong((long) ERR_PARAM));
PyDict_SetItemString(d,"ERR_NODATA", PyInt_FromLong((long) ERR_NODATA));
PyDict_SetItemString(d,"ERR_CANCEL", PyInt_FromLong((long) ERR_CANCEL));
@ -1703,7 +1744,7 @@ SWIGEXPORT(void,initwxpc)() {
PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.0"));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.3.1"));
PyDict_SetItemString(d,"cvar", SWIG_globals);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set);
SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set);

View File

@ -1,5 +1,3 @@
%module wxp
%{
/////////////////////////////////////////////////////////////////////////////
// Name: wxp.i
// Purpose: SWIG interface file for a python wxWindows module
@ -12,6 +10,10 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module wxp
%{
#ifdef __WXMSW__
#include <windows.h>
@ -178,6 +180,13 @@ extern "C" SWIGEXPORT(void,initcmndlgsc)();
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.3 1998/08/15 07:36:53 RD
// - Moved the header in the .i files out of the code that gets put into
// the .cpp files. It caused CVS conflicts because of the RCS ID being
// different each time.
//
// - A few minor fixes.
//
// Revision 1.2 1998/08/14 23:36:49 RD
// Beginings of wxGTK compatibility
//

View File

@ -25,6 +25,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def GetAppName(self):
val = wxpc.wxPyApp_GetAppName(self.this)
return val
def GetAuto3D(self):
val = wxpc.wxPyApp_GetAuto3D(self.this)
return val
def GetClassName(self):
val = wxpc.wxPyApp_GetClassName(self.this)
return val
@ -59,6 +62,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def SetAppName(self,arg0):
val = wxpc.wxPyApp_SetAppName(self.this,arg0)
return val
def SetAuto3D(self,arg0):
val = wxpc.wxPyApp_SetAuto3D(self.this,arg0)
return val
def SetClassName(self,arg0):
val = wxpc.wxPyApp_SetClassName(self.this,arg0)
return val
@ -311,6 +317,9 @@ wxOPEN = wxpc.wxOPEN
wxSAVE = wxpc.wxSAVE
wxHIDE_READONLY = wxpc.wxHIDE_READONLY
wxOVERWRITE_PROMPT = wxpc.wxOVERWRITE_PROMPT
wxACCEL_ALT = wxpc.wxACCEL_ALT
wxACCEL_CTRL = wxpc.wxACCEL_CTRL
wxACCEL_SHIFT = wxpc.wxACCEL_SHIFT
ERR_PARAM = wxpc.ERR_PARAM
ERR_NODATA = wxpc.ERR_NODATA
ERR_CANCEL = wxpc.ERR_CANCEL
@ -1371,8 +1380,12 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.3 1998/08/14 23:36:49 RD
# Beginings of wxGTK compatibility
# Revision 1.4 1998/08/15 07:36:54 RD
# - Moved the header in the .i files out of the code that gets put into
# the .cpp files. It caused CVS conflicts because of the RCS ID being
# different each time.
#
# - A few minor fixes.
#
# Revision 1.1 1998/08/09 08:25:49 RD
# Initial version