Changed the import semantics from "from wxPython import *" to "from

wxPython.wx import *"  This is for people who are worried about
namespace pollution, they can use "from wxPython import wx" and then
prefix all the wxPython identifiers with "wx."

Added wxTaskbarIcon for wxMSW.

Made the events work for wxGrid.

Added wxConfig.

Added wxMiniFrame for wxGTK, (untested.)

Changed many of the args and return values that were pointers to gdi
objects to references to reflect changes in the wxWindows API.

Other assorted fixes and additions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1998-12-15 20:44:37 +00:00
parent 5fc5e442f3
commit b8b8dda730
55 changed files with 4220 additions and 1541 deletions

View File

@@ -42,6 +42,28 @@ application will cause problems. However there is a plan to support
this in the future.
What's new in 0.5.0
-------------------
Changed the import semantics from "from wxPython import *" to "from
wxPython.wx import *" This is for people who are worried about
namespace pollution, they can use "from wxPython import wx" and then
prefix all the wxPython identifiers with "wx."
Added wxTaskbarIcon for wxMSW.
Made the events work for wxGrid.
Added wxConfig.
Added wxMiniFrame for wxGTK, (untested.)
Changed many of the args and return values that were pointers to gdi
objects to references to reflect changes in the wxWindows API.
Other assorted fixes and additions.
What's new in 0.4.2
-------------------

View File

@@ -334,6 +334,7 @@ PYMODULES = $(GENCODEDIR)/wxp.py $(GENCODEDIR)/events.py \
$(GENCODEDIR)/controls.py $(GENCODEDIR)/controls2.py \
$(GENCODEDIR)/windows2.py $(GENCODEDIR)/cmndlgs.py \
$(GENCODEDIR)/frames.py $(GENCODEDIR)/stattool.py \
$(GENCODEDIR)/utils.py \
__init__.py
@@ -346,8 +347,8 @@ $(GENCODEDIR)/%.py : %.i
# This one must leave out the -c flag so we define the whole rule
$(GENCODEDIR)/wxp.cpp $(GENCODEDIR)/wxp.py : wxp.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wxp.cpp wxp.i
$(GENCODEDIR)/wx.cpp $(GENCODEDIR)/wx.py : wx.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wx.cpp wx.i
# define some dependencies
@@ -362,6 +363,7 @@ $(GENCODEDIR)/controls2.cpp $(GENCODEDIR)/controls2.py : controls2.i my_typemap
$(GENCODEDIR)/cmndlgs.cpp $(GENCODEDIR)/cmndlgs.py : cmndlgs.i my_typemaps.i _defs.i
$(GENCODEDIR)/frames.cpp $(GENCODEDIR)/frames.py : frames.i my_typemaps.i _defs.i
$(GENCODEDIR)/stattool.cpp $(GENCODEDIR)/stattool.py : stattool.i my_typemaps.i _defs.i
$(GENCODEDIR)/utils.cpp $(GENCODEDIR)/utils.py : utils.i my_typemaps.i _defs.i
$(GENCODEDIR)/helpers.cpp:
ln -s `pwd`/helpers.cpp $@

View File

@@ -1,9 +1,7 @@
#----------------------------------------------------------------------------
# Name: __init__.py
# Purpose: The presence of this file turs this directory into a
# Python package. For simplicity, we import all of the
# wxPython package at this point, so users only need to
# import the package.
# Purpose: The presence of this file turns this directory into a
# Python package.
#
# Author: Robin Dunn
#
@@ -13,14 +11,29 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
from wxp import *
import wxp
__version__ = wxp.__version__
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.3 1998/12/15 20:41:12 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.2 1998/10/07 07:34:32 RD
# Version 0.4.1 for wxGTK
#

View File

@@ -152,6 +152,9 @@ enum {
wxDIALOG_MODELESS,
wxDEFAULT_FRAME_STYLE,
wxDEFAULT_DIALOG_STYLE,
wxFRAME_TOOL_WINDOW,
wxRETAINED,
wxBACKINGSTORE,
wxTB_3DBUTTONS,
@@ -333,7 +336,6 @@ enum {
wxACCEL_ALT,
wxACCEL_CTRL,
wxACCEL_SHIFT,
};
@@ -699,6 +701,25 @@ enum wxEventType {
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.9 1998/12/15 20:41:13 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.8 1998/11/15 23:03:42 RD
// Removing some ifdef's for wxGTK
//

View File

@@ -31,6 +31,7 @@
%import gdi.i
%import windows.i
%pragma(python) code = "import wx"
//----------------------------------------------------------------------
@@ -52,7 +53,7 @@ class wxColourDialog : public wxDialog {
public:
wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
#ifdef __WXMSW__
wxColourData& GetColourData();
@@ -74,7 +75,7 @@ public:
long style = 0,
const wxPoint& pos = wxPyDefaultPosition);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxString GetPath();
wxString GetMessage();
@@ -97,7 +98,7 @@ public:
long style = 0,
const wxPoint& pos = wxPyDefaultPosition);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxString GetDirectory();
wxString GetFilename();
@@ -140,7 +141,7 @@ public:
}
}
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
int GetSelection();
wxString GetStringSelection();
@@ -160,7 +161,7 @@ public:
long style = wxOK | wxCANCEL | wxCENTRE,
const wxPoint& pos = wxPyDefaultPosition);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxString GetValue();
void SetValue(const wxString& value);
@@ -194,7 +195,7 @@ class wxFontDialog : public wxDialog {
public:
wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxFontData& GetFontData();
int ShowModal();
@@ -241,7 +242,7 @@ class wxPageSetupDialog : public wxDialog {
public:
wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxPageSetupData& GetPageSetupData();
int ShowModal();
@@ -282,7 +283,7 @@ class wxPrintDialog : public wxDialog {
public:
wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
wxPrintData& GetPrintData();
%new wxDC* GetPrintDC();
@@ -299,7 +300,7 @@ public:
long style = wxOK | wxCANCEL | wxCENTRE,
const wxPoint& pos = wxPyDefaultPosition);
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
int ShowModal();
};
@@ -310,7 +311,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.7 1998/12/15 20:41:14 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.6 1998/11/25 08:45:22 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -36,7 +36,7 @@
%import gdi.i
%import events.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//----------------------------------------------------------------------
@@ -64,7 +64,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "button");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void SetDefault();
};
@@ -80,7 +80,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "button");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
wxBitmap& GetBitmapLabel();
#ifdef __WXMSW__
@@ -106,7 +106,7 @@ public:
const wxValidator& val = wxPyDefaultValidator,
char* name = "checkBox");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool GetValue();
void SetValue(const bool state);
@@ -124,7 +124,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "choice");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void Append(const wxString& item);
void Clear();
@@ -151,7 +151,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "comboBox");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void Append(const wxString& item);
// TODO: void Append(const wxString& item, char* clientData);
@@ -191,7 +191,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "gauge");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
int GetBezelFace();
int GetRange();
@@ -225,7 +225,7 @@ public:
long style = 0,
char* name = "staticText");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
wxString GetLabel();
void SetLabel(const wxString& label);
@@ -243,7 +243,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "listBox");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void Append(const wxString& item);
// TODO: void Append(const wxString& item, char* clientData);
@@ -282,7 +282,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "listBox");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool IsChecked(int uiIndex);
void Check(int uiIndex, bool bCheck = TRUE);
@@ -302,7 +302,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "text");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void Clear();
void Copy();
@@ -342,13 +342,13 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "scrollBar");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
int GetRange();
int GetPageSize();
int GetPosition();
int GetThumbPosition();
int GetThumbSize();
void SetPosition(int viewStart);
void SetThumbPosition(int viewStart);
void SetScrollbar(int position, int thumbSize,
int range, int pageSize,
bool refresh = TRUE);
@@ -382,7 +382,7 @@ public:
long style = 0,
char* name = "staticBitmap");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
wxBitmap& GetBitmap();
void SetBitmap(const wxBitmap& bitmap);
@@ -402,7 +402,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "radioBox");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
%name(EnableBox)void Enable(bool enable);
void Enable(int n, bool enable);
@@ -435,7 +435,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "radioButton");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool GetValue();
void SetValue(bool value);
@@ -453,7 +453,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "slider");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void ClearSel();
void ClearTicks();
@@ -483,6 +483,25 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.8 1998/12/15 20:41:15 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.7 1998/11/16 00:00:53 RD
// Generic treectrl for wxPython/GTK compiles...
//

View File

@@ -31,7 +31,7 @@
%import events.i
%import controls.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//----------------------------------------------------------------------
@@ -84,7 +84,7 @@ public:
const wxValidator& validator = wxPyDefaultValidator,
char* name = "listCtrl");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
bool DeleteItem(long item);
@@ -238,7 +238,7 @@ public:
//const wxValidator& validator = wxPyDefaultValidator,
char* name = "wxTreeCtrl");
#endif
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
size_t GetCount();
unsigned int GetIndent();
@@ -316,6 +316,9 @@ public:
// **** And this too
// wxTreeItemCmpFunc *cmpFunction = NULL);
void SetItemBold(const wxTreeItemId& item, bool bold = TRUE);
bool IsBold(const wxTreeItemId& item) const;
wxTreeItemId HitTest(const wxPoint& point);
};
@@ -337,7 +340,7 @@ public:
long style = 0,
char* name = "tabCtrl");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
bool DeleteAllItems();
bool DeleteItem(int item);
@@ -379,7 +382,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.11 1998/12/15 20:41:16 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.10 1998/11/25 08:45:23 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -54,11 +54,14 @@ public:
class wxCloseEvent : public wxEvent {
public:
// ??? it's in the docs ??? bool GetSessionEnding();
bool CanVeto();
// **** bool GetSessionEnding();
bool GetLoggingOff();
void Veto(bool veto = TRUE);
bool GetVeto();
void SetForce(bool force);
void SetCanVeto(bool canVeto);
void SetLoggingOff(bool loggingOff);
bool GetForce();
};
@@ -297,6 +300,25 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.5 1998/12/15 20:41:17 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.4 1998/11/16 00:00:55 RD
// Generic treectrl for wxPython/GTK compiles...
//

View File

@@ -33,7 +33,7 @@
%import windows.i
%import stattool.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//----------------------------------------------------------------------
@@ -45,7 +45,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
char* name = "frame");
%pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
void Centre(int direction = wxBOTH);
#ifdef __WXMSW__
@@ -55,7 +55,7 @@ public:
long style = wxST_SIZEGRIP,
wxWindowID id = -1,
char* name = "statusBar");
wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL|wxTB_FLAT,
wxWindowID id = -1,
char* name = "toolBar");
@@ -79,7 +79,6 @@ public:
//---------------------------------------------------------------------------
#ifdef __WXMSW__
class wxMiniFrame : public wxFrame {
public:
wxMiniFrame(wxWindow* parent, const wxWindowID id, const wxString& title,
@@ -88,7 +87,36 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
char* name = "frame");
%pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
};
#endif
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.3 1998/12/15 20:41:18 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//

View File

@@ -49,7 +49,7 @@ public:
void SetHeight(int height);
void SetMask(wxMask* mask);
#ifdef __WXMSW__
void SetPalette(wxPalette* palette);
void SetPalette(wxPalette& palette);
#endif
void SetWidth(int width);
};
@@ -220,7 +220,7 @@ public:
void SetColour(wxColour& colour);
#ifdef __WXMSW__
void SetDashes(int LCOUNT, wxDash* LIST);
void SetStipple(wxBitmap * stipple);
void SetStipple(wxBitmap& stipple);
#endif
void SetJoin(int join_style);
void SetStyle(int style);
@@ -246,7 +246,7 @@ public:
bool Ok();
#ifdef __WXMSW__
void SetColour(wxColour &colour);
void SetStipple(wxBitmap *bitmap);
void SetStipple(wxBitmap& bitmap);
void SetStyle(int style);
#endif
};
@@ -292,17 +292,17 @@ public:
#ifdef __WXGTK__
void FloodFill(long x, long y, wxColour* colour, int style=wxFLOOD_SURFACE);
#endif
wxBrush * GetBackground();
wxBrush * GetBrush();
wxBrush& GetBackground();
wxBrush& GetBrush();
long GetCharHeight();
long GetCharWidth();
void GetClippingBox(long *OUTPUT, long *OUTPUT,
long *OUTPUT, long *OUTPUT);
wxFont * GetFont();
wxFont& GetFont();
int GetLogicalFunction();
int GetMapMode();
bool GetOptimization();
wxPen * GetPen();
wxPen& GetPen();
%addmethods {
%new wxColour* GetPixel(long x, long y) {
wxColour* wc = new wxColour();
@@ -344,12 +344,12 @@ public:
%addmethods {
// This one is my own creation...
void DrawBitmap(wxBitmap* bitmap, long x, long y, bool swapPalette=TRUE) {
void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) {
wxMemoryDC* memDC = new wxMemoryDC;
memDC->SelectObject(bitmap);
if (swapPalette)
self->SetPalette(bitmap->GetPalette());
self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC,
self->SetPalette(*bitmap.GetPalette());
self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
0, 0, self->GetLogicalFunction());
memDC->SelectObject(wxNullBitmap);
delete memDC;
@@ -511,7 +511,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.7 1998/12/15 20:41:18 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.6 1998/11/25 08:45:24 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -33,6 +33,25 @@
* and things like that.
*
* $Log$
* Revision 1.1 1998/12/15 20:41:59 RD
* Changed the import semantics from "from wxPython import *" to "from
* wxPython.wx import *" This is for people who are worried about
* namespace pollution, they can use "from wxPython import wx" and then
* prefix all the wxPython identifiers with "wx."
*
* Added wxTaskbarIcon for wxMSW.
*
* Made the events work for wxGrid.
*
* Added wxConfig.
*
* Added wxMiniFrame for wxGTK, (untested.)
*
* Changed many of the args and return values that were pointers to gdi
* objects to references to reflect changes in the wxWindows API.
*
* Other assorted fixes and additions.
*
* Revision 1.9 1998/11/16 00:01:41 RD
* Generic treectrl for wxPython/GTK compiles...
*

View File

@@ -1125,6 +1125,25 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.1 1998/12/15 20:42:01 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.9 1998/11/16 00:01:43 RD
# Generic treectrl for wxPython/GTK compiles...
#

View File

@@ -103,7 +103,7 @@ void wxPyApp::AfterMainLoop(void) {
#ifdef __WXGTK__
wxApp::CommonCleanUp();
#endif
delete wxPythonApp;
// delete wxPythonApp;
}
@@ -602,7 +602,27 @@ wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source) {
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.15 1998/12/15 20:41:19 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.14 1998/11/25 08:45:25 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -20,7 +20,8 @@ PYTHONDIR=e:\Tools\Python15
FINAL=0
# Set this to where you want the stuff installed at. It should
# be a directory contained in a PYTHONPATH directory.
# be a directory contained in a PYTHONPATH directory, and should be
# named wxPython
TARGETDIR=..
# Set this to 1 for make to pre-compile the Python modules, 0 to
@@ -28,6 +29,8 @@ TARGETDIR=..
# runtime.
COMPILEPY=0
SEPARATE=0
#----------------------------------------------------------------------
WXUSINGDLL=0
@@ -46,21 +49,28 @@ GENCODEDIR=msw
#----------------------------------------------------------------------
TARGET = wxpc
TARGET = wxc
OBJECTS = wxp.obj helpers.obj windows.obj events.obj \
OBJECTS = wx.obj helpers.obj windows.obj events.obj \
misc.obj gdi.obj mdi.obj controls.obj \
controls2.obj windows2.obj cmndlgs.obj stattool.obj \
frames.obj
frames.obj \
!if "$(SEPARATE)" == "0"
utils.obj
!else
TARGET2 = utilsc
OBJECTS2 = utils.obj
target2=$(TARGETDIR)\$(TARGET2).pyd
!endif
PYMODULES = $(TARGETDIR)\wxp.py $(TARGETDIR)\events.py \
PYMODULES = $(TARGETDIR)\wx.py $(TARGETDIR)\events.py \
$(TARGETDIR)\windows.py $(TARGETDIR)\misc.py \
$(TARGETDIR)\gdi.py $(TARGETDIR)\mdi.py \
$(TARGETDIR)\controls.py $(TARGETDIR)\controls2.py \
$(TARGETDIR)\windows2.py $(TARGETDIR)\cmndlgs.py \
$(TARGETDIR)\stattool.py $(TARGETDIR)\frames.py \
$(TARGETDIR)\__init__.py
$(TARGETDIR)\utils.py $(TARGETDIR)\__init__.py
#----------------------------------------------------------------------
@@ -74,11 +84,14 @@ DEBUGLFLAGS = /INCREMENTAL:NO
LFLAGS= $(DEBUGLFLAGS) /DLL /def:$(TARGET).def /subsystem:windows,3.50 \
/machine:I386 /implib:./$(TARGET).lib /nologo
LFLAGS2=$(DEBUGLFLAGS) /DLL /def:$(TARGET2).def /subsystem:windows,3.50 \
/machine:I386 /implib:./$(TARGET2).lib /nologo
#----------------------------------------------------------------------
default: $(TARGETDIR)\$(TARGET).pyd pycfiles
default: $(TARGETDIR)\$(TARGET).pyd $(target2) pycfiles
all: wx $(TARGET)
all: wx $(TARGET) $(TARGET2)
wx:
cd $(WXDIR)\src\msw
@@ -107,6 +120,14 @@ $(DUMMYOBJ) $(OBJECTS) $(TARGET).res
$(LIBS)
<<
$(TARGETDIR)\$(TARGET2).pyd : $(DUMMYOBJ) $(WXLIB) $(OBJECTS2)
$(link) @<<
/out:$@ /dll
$(LFLAGS2)
$(DUMMYOBJ) $(OBJECTS2)
$(LIBS)
<<
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
$(rc) -r /i$(WXDIR)\include -fo$@ $(TARGET).rc
@@ -135,11 +156,16 @@ clean:
-erase *.pch
-erase $(TARGET).exp
-erase $(TARGET).lib
-erase $(TARGETDIR)\$(TARGET).*
!if "$(SEPARATE)" != "0"
-erase $(TARGET2).exp
-erase $(TARGET2).lib
-erase $(TARGETDIR)\$(TARGET2).*
!endif
-erase $(TARGETDIR)\$(TARGET).pyd
-erase $(TARGETDIR)\*.py
-erase $(TARGETDIR)\*.pyc
-erase $(TARGETDIR)\*.pyo
-erase $(TARGETDIR)\$(TARGET).*
@@ -168,8 +194,8 @@ clean:
# This one must leave out the -c flag so we define the whole rule
$(GENCODEDIR)\wxp.cpp $(GENCODEDIR)\wxp.py : wxp.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wxp.cpp wxp.i
$(GENCODEDIR)\wx.cpp $(GENCODEDIR)\wx.py : wx.i my_typemaps.i _defs.i _extras.py
swig $(SWIGFLAGS) -o $(GENCODEDIR)/wx.cpp wx.i
# Define some dependencies. These MUST use forward slashes so SWIG
@@ -186,8 +212,15 @@ $(GENCODEDIR)/cmndlgs.cpp $(GENCODEDIR)/cmndlgs.py : cmndlgs.i my_typemap
$(GENCODEDIR)/stattool.cpp $(GENCODEDIR)/stattool.py : stattool.i my_typemaps.i _defs.i
$(GENCODEDIR)/frames.cpp $(GENCODEDIR)/frames.py : frames.i my_typemaps.i _defs.i
!if "$(SEPARATE)" == "1"
$(GENCODEDIR)\utils.cpp $(GENCODEDIR)\utils.py : utils.i my_typemaps.i
swig $(SWIGFLAGS) -o $(GENCODEDIR)/utils.cpp utils.i
!else
$(GENCODEDIR)/utils.cpp $(GENCODEDIR)/utils.py : utils.i my_typemaps.i _defs.i
!endif
$(TARGETDIR)\wxp.py : $(GENCODEDIR)\wxp.py
$(TARGETDIR)\wx.py : $(GENCODEDIR)\wx.py
$(TARGETDIR)\windows.py : $(GENCODEDIR)\windows.py
$(TARGETDIR)\windows2.py : $(GENCODEDIR)\windows2.py
$(TARGETDIR)\events.py : $(GENCODEDIR)\events.py
@@ -199,13 +232,34 @@ $(TARGETDIR)\controls2.py : $(GENCODEDIR)\controls2.py
$(TARGETDIR)\cmndlgs.py : $(GENCODEDIR)\cmndlgs.py
$(TARGETDIR)\frames.py : $(GENCODEDIR)\frames.py
$(TARGETDIR)\stattool.py : $(GENCODEDIR)\stattool.py
$(TARGETDIR)\utils.py : $(GENCODEDIR)\utils.py
$(TARGETDIR)\__init__.py : __init__.py
#------------------------------------------------------------------------
#
# $Log$
# Revision 1.7 1998/12/15 20:41:20 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.6 1998/10/02 06:40:41 RD
#
# Version 0.4 of wxPython for MSW.
#
# Revision 1.5 1998/08/19 00:38:23 RD

View File

@@ -28,7 +28,7 @@
%import windows.i
%import frames.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//----------------------------------------------------------------------
@@ -42,7 +42,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const char* name = "frame");
%pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
void ActivateNext();
void ActivatePrevious();
@@ -74,7 +74,7 @@ public:
long style = wxDEFAULT_FRAME_STYLE,
const char* name = "frame");
%pragma(python) addtomethod = "__init__:wxp._StdFrameCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdFrameCallbacks(self)"
void Activate();
void Maximize();
@@ -92,15 +92,35 @@ public:
class wxMDIClientWindow : public wxWindow {
public:
wxMDIClientWindow(wxMDIParentFrame* parent, long style = 0);
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wxp._StdOnScrollCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
};
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.5 1998/12/15 20:41:21 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.4 1998/10/02 06:40:41 RD
//
// Version 0.4 of wxPython for MSW.
//
// Revision 1.3 1998/08/18 19:48:18 RD

View File

@@ -165,7 +165,7 @@ int wxMessageBox(const wxString& message,
bool wxColourDisplay();
int wxDisplayDepth();
void wxSetCursor(wxCursor *cursor);
void wxSetCursor(wxCursor& cursor);
//---------------------------------------------------------------------------
// Miscellaneous functions
@@ -358,7 +358,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.8 1998/12/15 20:41:22 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.7 1998/11/25 08:45:27 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -6,6 +6,7 @@ from misc import *
from gdi import *
from windows import *
import wx
class wxColourDataPtr :
def __init__(self,this):
self.this = this
@@ -65,7 +66,7 @@ class wxColourDialog(wxColourDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxColourDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -102,7 +103,7 @@ class wxDirDialog(wxDirDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -166,7 +167,7 @@ class wxFileDialog(wxFileDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxFileDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -197,7 +198,7 @@ class wxSingleChoiceDialog(wxSingleChoiceDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxSingleChoiceDialog,(arg0.this,arg1,arg2,arg3,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -225,7 +226,7 @@ class wxTextEntryDialog(wxTextEntryDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxTextEntryDialog,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -312,7 +313,7 @@ class wxFontDialog(wxFontDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxFontDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -443,7 +444,7 @@ class wxPageSetupDialog(wxPageSetupDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxPageSetupDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -554,7 +555,7 @@ class wxPrintDialog(wxPrintDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxPrintDialog,(arg0.this,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -576,7 +577,7 @@ class wxMessageDialog(wxMessageDialogPtr):
args = tuple(argl)
self.this = apply(cmndlgsc.new_wxMessageDialog,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)

View File

@@ -3743,23 +3743,23 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxScrollBar_GetPosition(_swigobj) (_swigobj->GetPosition())
static PyObject *_wrap_wxScrollBar_GetPosition(PyObject *self, PyObject *args) {
#define wxScrollBar_GetThumbPosition(_swigobj) (_swigobj->GetThumbPosition())
static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args) {
PyObject * _resultobj;
int _result;
wxScrollBar * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetPosition",&_argc0))
if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetThumbPosition",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetPosition. Expected _wxScrollBar_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbPosition. Expected _wxScrollBar_p.");
return NULL;
}
}
_result = (int )wxScrollBar_GetPosition(_arg0);
_result = (int )wxScrollBar_GetThumbPosition(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
@@ -3785,23 +3785,23 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args)
return _resultobj;
}
#define wxScrollBar_SetPosition(_swigobj,_swigarg0) (_swigobj->SetPosition(_swigarg0))
static PyObject *_wrap_wxScrollBar_SetPosition(PyObject *self, PyObject *args) {
#define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0) (_swigobj->SetThumbPosition(_swigarg0))
static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxScrollBar * _arg0;
int _arg1;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetPosition",&_argc0,&_arg1))
if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetThumbPosition",&_argc0,&_arg1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetPosition. Expected _wxScrollBar_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetThumbPosition. Expected _wxScrollBar_p.");
return NULL;
}
}
wxScrollBar_SetPosition(_arg0,_arg1);
wxScrollBar_SetThumbPosition(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -5314,9 +5314,9 @@ static PyMethodDef controlscMethods[] = {
{ "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, 1 },
{ "new_wxSpinButton", _wrap_new_wxSpinButton, 1 },
{ "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, 1 },
{ "wxScrollBar_SetPosition", _wrap_wxScrollBar_SetPosition, 1 },
{ "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, 1 },
{ "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, 1 },
{ "wxScrollBar_GetPosition", _wrap_wxScrollBar_GetPosition, 1 },
{ "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, 1 },
{ "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, 1 },
{ "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, 1 },
{ "new_wxScrollBar", _wrap_new_wxScrollBar, 1 },
@@ -5451,6 +5451,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler);
@@ -5551,6 +5552,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -5715,6 +5717,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -5766,6 +5769,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);

View File

@@ -8,7 +8,7 @@ from windows import *
from gdi import *
from events import *
import wxp
import wx
class wxControlPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
@@ -50,7 +50,7 @@ class wxButton(wxButtonPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxButton,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -99,7 +99,7 @@ class wxBitmapButton(wxBitmapButtonPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxBitmapButton,(arg0.this,arg1,arg2.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -126,7 +126,7 @@ class wxCheckBox(wxCheckBoxPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxCheckBox,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -180,7 +180,7 @@ class wxChoice(wxChoicePtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxChoice,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -264,7 +264,7 @@ class wxComboBox(wxComboBoxPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxComboBox,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -309,7 +309,7 @@ class wxGauge(wxGaugePtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxGauge,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -356,7 +356,7 @@ class wxStaticText(wxStaticTextPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxStaticText,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -425,7 +425,7 @@ class wxListBox(wxListBoxPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxListBox,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -455,7 +455,7 @@ class wxCheckListBox(wxCheckListBoxPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -551,7 +551,7 @@ class wxTextCtrl(wxTextCtrlPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxTextCtrl,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -566,14 +566,14 @@ class wxScrollBarPtr(wxControlPtr):
def GetPageSize(self):
val = controlsc.wxScrollBar_GetPageSize(self.this)
return val
def GetPosition(self):
val = controlsc.wxScrollBar_GetPosition(self.this)
def GetThumbPosition(self):
val = controlsc.wxScrollBar_GetThumbPosition(self.this)
return val
def GetThumbSize(self):
val = controlsc.wxScrollBar_GetThumbSize(self.this)
return val
def SetPosition(self,arg0):
val = controlsc.wxScrollBar_SetPosition(self.this,arg0)
def SetThumbPosition(self,arg0):
val = controlsc.wxScrollBar_SetThumbPosition(self.this,arg0)
return val
def SetScrollbar(self,arg0,arg1,arg2,arg3,*args):
val = apply(controlsc.wxScrollBar_SetScrollbar,(self.this,arg0,arg1,arg2,arg3,)+args)
@@ -590,7 +590,7 @@ class wxScrollBar(wxScrollBarPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxScrollBar,(arg0.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -653,7 +653,7 @@ class wxStaticBitmap(wxStaticBitmapPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxStaticBitmap,(arg0.this,arg1,arg2.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -719,7 +719,7 @@ class wxRadioBox(wxRadioBoxPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxRadioBox,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -746,7 +746,7 @@ class wxRadioButton(wxRadioButtonPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxRadioButton,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -824,7 +824,7 @@ class wxSlider(wxSliderPtr):
args = tuple(argl)
self.this = apply(controlsc.new_wxSlider,(arg0.this,arg1,arg2,arg3,arg4,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)

View File

@@ -3730,7 +3730,102 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxTreeCtrl_SetItemBold(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetItemBold(_swigarg0,_swigarg1))
static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxTreeCtrl * _arg0;
wxTreeItemId * _arg1;
bool _arg2 = (1);
char * _argc0 = 0;
char * _argc1 = 0;
int tempbool2;
self = self;
if(!PyArg_ParseTuple(args,"ss|i:wxTreeCtrl_SetItemBold",&_argc0,&_argc1,&tempbool2))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SetItemBold. Expected _wxTreeCtrl_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SetItemBold. Expected _wxTreeItemId_p.");
return NULL;
}
}
_arg2 = (bool ) tempbool2;
wxTreeCtrl_SetItemBold(_arg0,*_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxTreeCtrl_IsBold(_swigobj,_swigarg0) (_swigobj->IsBold(_swigarg0))
static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxTreeCtrl * _arg0;
wxTreeItemId * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_IsBold",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_IsBold. Expected _wxTreeCtrl_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_IsBold. Expected _wxTreeItemId_p.");
return NULL;
}
}
_result = (bool )wxTreeCtrl_IsBold(_arg0,*_arg1);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxTreeCtrl_HitTest(_swigobj,_swigarg0) (_swigobj->HitTest(_swigarg0))
static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxTreeItemId * _result;
wxTreeCtrl * _arg0;
wxPoint * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_HitTest",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_HitTest. Expected _wxTreeCtrl_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p.");
return NULL;
}
}
_result = new wxTreeItemId (wxTreeCtrl_HitTest(_arg0,*_arg1));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, 1 },
{ "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, 1 },
{ "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, 1 },
{ "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 },
{ "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 },
{ "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 },
@@ -3885,6 +3980,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxTreeCtrl",SwigwxTreeCtrlTowxEvtHandler);
@@ -3963,6 +4059,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -4064,6 +4161,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -4087,6 +4185,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);

View File

@@ -10,7 +10,7 @@ from gdi import *
from events import *
from controls import *
import wxp
import wx
class wxListItemPtr :
def __init__(self,this):
self.this = this
@@ -313,7 +313,7 @@ class wxListCtrl(wxListCtrlPtr):
args = tuple(argl)
self.this = apply(controls2c.new_wxListCtrl,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -581,6 +581,17 @@ class wxTreeCtrlPtr(wxControlPtr):
def EndEditLabel(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args)
return val
def SetItemBold(self,arg0,*args):
val = apply(controls2c.wxTreeCtrl_SetItemBold,(self.this,arg0.this,)+args)
return val
def IsBold(self,arg0):
val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this)
return val
def HitTest(self,arg0):
val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this)
val = wxTreeItemIdPtr(val)
val.thisown = 1
return val
def __repr__(self):
return "<C wxTreeCtrl instance>"
class wxTreeCtrl(wxTreeCtrlPtr):
@@ -593,7 +604,7 @@ class wxTreeCtrl(wxTreeCtrlPtr):
args = tuple(argl)
self.this = apply(controls2c.new_wxTreeCtrl,(arg0.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)

View File

@@ -379,6 +379,27 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) {
return (void *) dest;
}
#define wxCloseEvent_CanVeto(_swigobj) (_swigobj->CanVeto())
static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxCloseEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxCloseEvent_CanVeto",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_CanVeto. Expected _wxCloseEvent_p.");
return NULL;
}
}
_result = (bool )wxCloseEvent_CanVeto(_arg0);
_resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxCloseEvent_GetLoggingOff(_swigobj) (_swigobj->GetLoggingOff())
static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -469,6 +490,54 @@ static PyObject *_wrap_wxCloseEvent_SetForce(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxCloseEvent_SetCanVeto(_swigobj,_swigarg0) (_swigobj->SetCanVeto(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxCloseEvent * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetCanVeto",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetCanVeto. Expected _wxCloseEvent_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
wxCloseEvent_SetCanVeto(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxCloseEvent_SetLoggingOff(_swigobj,_swigarg0) (_swigobj->SetLoggingOff(_swigarg0))
static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxCloseEvent * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"si:wxCloseEvent_SetLoggingOff",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCloseEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCloseEvent_SetLoggingOff. Expected _wxCloseEvent_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
wxCloseEvent_SetLoggingOff(_arg0,_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxCloseEvent_GetForce(_swigobj) (_swigobj->GetForce())
static PyObject *_wrap_wxCloseEvent_GetForce(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -2628,10 +2697,13 @@ static PyMethodDef eventscMethods[] = {
{ "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, 1 },
{ "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, 1 },
{ "wxCloseEvent_GetForce", _wrap_wxCloseEvent_GetForce, 1 },
{ "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, 1 },
{ "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, 1 },
{ "wxCloseEvent_SetForce", _wrap_wxCloseEvent_SetForce, 1 },
{ "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, 1 },
{ "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, 1 },
{ "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, 1 },
{ "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, 1 },
{ "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, 1 },
{ "wxEvent_Skip", _wrap_wxEvent_Skip, 1 },
{ "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, 1 },
@@ -2707,6 +2779,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
@@ -2789,6 +2862,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxCloseEvent","_class_wxCloseEvent",0);
SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -2841,6 +2915,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0);
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
@@ -2848,6 +2923,7 @@ SWIGEXPORT(void,initeventsc)() {
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent);

View File

@@ -67,6 +67,9 @@ class wxCloseEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def CanVeto(self):
val = eventsc.wxCloseEvent_CanVeto(self.this)
return val
def GetLoggingOff(self):
val = eventsc.wxCloseEvent_GetLoggingOff(self.this)
return val
@@ -79,6 +82,12 @@ class wxCloseEventPtr(wxEventPtr):
def SetForce(self,arg0):
val = eventsc.wxCloseEvent_SetForce(self.this,arg0)
return val
def SetCanVeto(self,arg0):
val = eventsc.wxCloseEvent_SetCanVeto(self.this,arg0)
return val
def SetLoggingOff(self,arg0):
val = eventsc.wxCloseEvent_SetLoggingOff(self.this,arg0)
return val
def GetForce(self):
val = eventsc.wxCloseEvent_GetForce(self.this)
return val

View File

@@ -264,7 +264,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxToolBar * _result;
wxFrame * _arg0;
long _arg1 = (wxNO_BORDER)|(wxTB_HORIZONTAL);
long _arg1 = (wxNO_BORDER)|(wxTB_HORIZONTAL)|(wxTB_FLAT);
wxWindowID _arg2 = -1;
char * _arg3 = "toolBar";
char * _argc0 = 0;
@@ -821,6 +821,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMiniFrame",SwigwxMiniFrameTowxEvtHandler);
@@ -892,6 +893,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -989,6 +991,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -1007,6 +1010,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);

View File

@@ -12,7 +12,7 @@ from stattool import *
from controls import *
from events import *
import wxp
import wx
class wxFramePtr(wxWindowPtr):
def __init__(self,this):
self.this = this
@@ -91,7 +91,7 @@ class wxFrame(wxFramePtr):
args = tuple(argl)
self.this = apply(framesc.new_wxFrame,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdFrameCallbacks(self)
wx._StdFrameCallbacks(self)
@@ -112,7 +112,7 @@ class wxMiniFrame(wxMiniFramePtr):
args = tuple(argl)
self.this = apply(framesc.new_wxMiniFrame,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdFrameCallbacks(self)
wx._StdFrameCallbacks(self)

View File

@@ -1318,7 +1318,7 @@ static PyObject *_wrap_wxBitmap_SetPalette(PyObject *self, PyObject *args) {
return NULL;
}
}
wxBitmap_SetPalette(_arg0,_arg1);
wxBitmap_SetPalette(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -2536,7 +2536,7 @@ static PyObject *_wrap_wxPen_SetStipple(PyObject *self, PyObject *args) {
return NULL;
}
}
wxPen_SetStipple(_arg0,_arg1);
wxPen_SetStipple(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -2776,7 +2776,7 @@ static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) {
return NULL;
}
}
wxBrush_SetStipple(_arg0,_arg1);
wxBrush_SetStipple(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -3476,7 +3476,8 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxBrush *)wxDC_GetBackground(_arg0);
wxBrush & _result_ref = wxDC_GetBackground(_arg0);
_result = (wxBrush *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -3499,7 +3500,8 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxBrush *)wxDC_GetBrush(_arg0);
wxBrush & _result_ref = wxDC_GetBrush(_arg0);
_result = (wxBrush *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -3625,7 +3627,8 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxFont *)wxDC_GetFont(_arg0);
wxFont & _result_ref = wxDC_GetFont(_arg0);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -3711,7 +3714,8 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxPen *)wxDC_GetPen(_arg0);
wxPen & _result_ref = wxDC_GetPen(_arg0);
_result = (wxPen *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -4521,12 +4525,12 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
return _resultobj;
}
static void wxDC_DrawBitmap(wxDC *self,wxBitmap * bitmap,long x,long y,bool swapPalette) {
static void wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long x,long y,bool swapPalette) {
wxMemoryDC* memDC = new wxMemoryDC;
memDC->SelectObject(bitmap);
if (swapPalette)
self->SetPalette(bitmap->GetPalette());
self->Blit(x, y, bitmap->GetWidth(), bitmap->GetHeight(), memDC,
self->SetPalette(*bitmap.GetPalette());
self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
0, 0, self->GetLogicalFunction());
memDC->SelectObject(wxNullBitmap);
delete memDC;
@@ -4558,7 +4562,7 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
}
}
_arg4 = (bool ) tempbool4;
wxDC_DrawBitmap(_arg0,_arg1,_arg2,_arg3,_arg4);
wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -5329,6 +5333,7 @@ SWIGEXPORT(void,initgdic)() {
*/
SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
@@ -5374,6 +5379,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -5439,6 +5445,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
@@ -5446,6 +5453,7 @@ SWIGEXPORT(void,initgdic)() {
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap);

View File

@@ -751,6 +751,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMDIClientWindow",SwigwxMDIClientWindowTowxEvtHandler);
@@ -825,6 +826,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -929,6 +931,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
@@ -948,6 +951,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_class_wxMiniFrame","_wxMiniFrame",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);

View File

@@ -14,7 +14,7 @@ from stattool import *
from controls import *
from events import *
import wxp
import wx
class wxMDIParentFramePtr(wxFramePtr):
def __init__(self,this):
self.this = this
@@ -64,7 +64,7 @@ class wxMDIParentFrame(wxMDIParentFramePtr):
args = tuple(argl)
self.this = apply(mdic.new_wxMDIParentFrame,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdFrameCallbacks(self)
wx._StdFrameCallbacks(self)
@@ -103,7 +103,7 @@ class wxMDIChildFrame(wxMDIChildFramePtr):
args = tuple(argl)
self.this = apply(mdic.new_wxMDIChildFrame,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdFrameCallbacks(self)
wx._StdFrameCallbacks(self)
@@ -118,8 +118,8 @@ class wxMDIClientWindow(wxMDIClientWindowPtr):
def __init__(self,arg0,*args) :
self.this = apply(mdic.new_wxMDIClientWindow,(arg0.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wxp._StdOnScrollCallbacks(self)
wx._StdWindowCallbacks(self)
wx._StdOnScrollCallbacks(self)

View File

@@ -450,7 +450,7 @@ static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
return NULL;
}
}
wxSetCursor(_arg0);
wxSetCursor(*_arg0);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;

View File

@@ -1584,6 +1584,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxToolBar",SwigwxToolBarTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxToolBar",SwigwxToolBarTowxEvtHandler);
@@ -1654,6 +1655,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0);
SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
@@ -1750,6 +1752,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0);
SWIG_RegisterMapping("_wxButton","_class_wxButton",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0);
@@ -1769,6 +1772,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0);
SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0);
SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0);
SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0);
SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0);

View File

@@ -10,6 +10,7 @@ from gdi import *
from controls import *
from events import *
import wx
class wxStatusBarPtr(wxWindowPtr):
def __init__(self,this):
self.this = this
@@ -55,7 +56,7 @@ class wxStatusBar(wxStatusBarPtr):
args = tuple(argl)
self.this = apply(stattoolc.new_wxStatusBar,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -261,7 +262,7 @@ class wxToolBar(wxToolBarPtr):
args = tuple(argl)
self.this = apply(stattoolc.new_wxToolBar,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,114 @@
# This file was created automatically by SWIG.
import utilsc
class wxConfigPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
utilsc.delete_wxConfig(self.this)
def DontCreateOnDemand(self):
val = utilsc.wxConfig_DontCreateOnDemand(self.this)
return val
def DeleteEntry(self,arg0,*args):
val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args)
return val
def DeleteGroup(self,arg0):
val = utilsc.wxConfig_DeleteGroup(self.this,arg0)
return val
def Exists(self,arg0):
val = utilsc.wxConfig_Exists(self.this,arg0)
return val
def Flush(self,*args):
val = apply(utilsc.wxConfig_Flush,(self.this,)+args)
return val
def GetAppName(self):
val = utilsc.wxConfig_GetAppName(self.this)
return val
def GetFirstGroup(self):
val = utilsc.wxConfig_GetFirstGroup(self.this)
return val
def GetFirstEntry(self):
val = utilsc.wxConfig_GetFirstEntry(self.this)
return val
def GetNextGroup(self,arg0):
val = utilsc.wxConfig_GetNextGroup(self.this,arg0)
return val
def GetNextEntry(self,arg0):
val = utilsc.wxConfig_GetNextEntry(self.this,arg0)
return val
def GetNumberOfEntries(self,*args):
val = apply(utilsc.wxConfig_GetNumberOfEntries,(self.this,)+args)
return val
def GetNumberOfGroups(self,*args):
val = apply(utilsc.wxConfig_GetNumberOfGroups,(self.this,)+args)
return val
def GetPath(self):
val = utilsc.wxConfig_GetPath(self.this)
return val
def GetVendorName(self):
val = utilsc.wxConfig_GetVendorName(self.this)
return val
def HasEntry(self,arg0):
val = utilsc.wxConfig_HasEntry(self.this,arg0)
return val
def HasGroup(self,arg0):
val = utilsc.wxConfig_HasGroup(self.this,arg0)
return val
def IsExpandingEnvVars(self):
val = utilsc.wxConfig_IsExpandingEnvVars(self.this)
return val
def IsRecordingDefaults(self):
val = utilsc.wxConfig_IsRecordingDefaults(self.this)
return val
def Read(self,arg0,*args):
val = apply(utilsc.wxConfig_Read,(self.this,arg0,)+args)
return val
def ReadInt(self,arg0,*args):
val = apply(utilsc.wxConfig_ReadInt,(self.this,arg0,)+args)
return val
def ReadFloat(self,arg0,*args):
val = apply(utilsc.wxConfig_ReadFloat,(self.this,arg0,)+args)
return val
def SetAppName(self,arg0):
val = utilsc.wxConfig_SetAppName(self.this,arg0)
return val
def SetExpandEnvVars(self,*args):
val = apply(utilsc.wxConfig_SetExpandEnvVars,(self.this,)+args)
return val
def SetPath(self,arg0):
val = utilsc.wxConfig_SetPath(self.this,arg0)
return val
def SetRecordDefaults(self,*args):
val = apply(utilsc.wxConfig_SetRecordDefaults,(self.this,)+args)
return val
def SetVendorName(self,arg0):
val = utilsc.wxConfig_SetVendorName(self.this,arg0)
return val
def Write(self,arg0,arg1):
val = utilsc.wxConfig_Write(self.this,arg0,arg1)
return val
def WriteInt(self,arg0,arg1):
val = utilsc.wxConfig_WriteInt(self.this,arg0,arg1)
return val
def WriteFloat(self,arg0,arg1):
val = utilsc.wxConfig_WriteFloat(self.this,arg0,arg1)
return val
def __repr__(self):
return "<C wxConfig instance>"
class wxConfig(wxConfigPtr):
def __init__(self,*args) :
self.this = apply(utilsc.new_wxConfig,()+args)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

View File

@@ -593,8 +593,8 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetClientSize(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
#define wxWindow_GetClientSizeTuple(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetClientSize(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int * _arg1;
@@ -610,15 +610,15 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
{
_arg2 = &temp0;
}
if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0))
if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSizeTuple",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSizeTuple. Expected _wxWindow_p.");
return NULL;
}
}
wxWindow_GetClientSize(_arg0,_arg1,_arg2);
wxWindow_GetClientSizeTuple(_arg0,_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
{
@@ -634,6 +634,29 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetClientSize(_swigobj) (_swigobj->GetClientSize())
static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxSize * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetClientSize",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetClientSize. Expected _wxWindow_p.");
return NULL;
}
}
_result = new wxSize (wxWindow_GetClientSize(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_GetConstraints(_swigobj) (_swigobj->GetConstraints())
static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -697,7 +720,8 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxFont *)wxWindow_GetFont(_arg0);
wxFont & _result_ref = wxWindow_GetFont(_arg0);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -770,47 +794,6 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPosition(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int * _arg1;
int temp;
int * _arg2;
int temp0;
char * _argc0 = 0;
self = self;
{
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
return NULL;
}
}
wxWindow_GetPosition(_arg0,_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg1));
_resultobj = t_output_helper(_resultobj, o);
}
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}
#define wxWindow_GetLabel(_swigobj) (_swigobj->GetLabel())
static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -886,6 +869,93 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetPositionTuple(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetPosition(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int * _arg1;
int temp;
int * _arg2;
int temp0;
char * _argc0 = 0;
self = self;
{
_arg1 = &temp;
}
{
_arg2 = &temp0;
}
if(!PyArg_ParseTuple(args,"s:wxWindow_GetPositionTuple",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPositionTuple. Expected _wxWindow_p.");
return NULL;
}
}
wxWindow_GetPositionTuple(_arg0,_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg1));
_resultobj = t_output_helper(_resultobj, o);
}
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}
#define wxWindow_GetPosition(_swigobj) (_swigobj->GetPosition())
static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPoint * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p.");
return NULL;
}
}
_result = new wxPoint (wxWindow_GetPosition(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_GetRect(_swigobj) (_swigobj->GetRect())
static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxRect * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetRect",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetRect. Expected _wxWindow_p.");
return NULL;
}
}
_result = new wxRect (wxWindow_GetRect(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_GetReturnCode(_swigobj) (_swigobj->GetReturnCode())
static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -973,8 +1043,8 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetSize(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
#define wxWindow_GetSizeTuple(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetSize(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int * _arg1;
@@ -990,15 +1060,15 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
{
_arg2 = &temp0;
}
if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0))
if(!PyArg_ParseTuple(args,"s:wxWindow_GetSizeTuple",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSizeTuple. Expected _wxWindow_p.");
return NULL;
}
}
wxWindow_GetSize(_arg0,_arg1,_arg2);
wxWindow_GetSizeTuple(_arg0,_arg1,_arg2);
Py_INCREF(Py_None);
_resultobj = Py_None;
{
@@ -1014,6 +1084,29 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetSize(_swigobj) (_swigobj->GetSize())
static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxSize * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p.");
return NULL;
}
}
_result = new wxSize (wxWindow_GetSize(_arg0));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -1519,6 +1612,35 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0) (_swigobj->SetAcceleratorTable(_swigarg0))
static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
wxAcceleratorTable * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"ss:wxWindow_SetAcceleratorTable",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetAcceleratorTable. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxAcceleratorTable_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetAcceleratorTable. Expected _wxAcceleratorTable_p.");
return NULL;
}
}
wxWindow_SetAcceleratorTable(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWindow_SetAutoLayout(_swigobj,_swigarg0) (_swigobj->SetAutoLayout(_swigarg0))
static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -2147,6 +2269,130 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_ConvertDialogPointToPixels(_swigobj,_swigarg0) (_swigobj->ConvertDialogToPixels(_swigarg0))
static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPoint * _result;
wxWindow * _arg0;
wxPoint * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogPointToPixels",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogPointToPixels. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogPointToPixels. Expected _wxPoint_p.");
return NULL;
}
}
_result = new wxPoint (wxWindow_ConvertDialogPointToPixels(_arg0,*_arg1));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_ConvertDialogSizeToPixels(_swigobj,_swigarg0) (_swigobj->ConvertDialogToPixels(_swigarg0))
static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxSize * _result;
wxWindow * _arg0;
wxSize * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertDialogSizeToPixels",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertDialogSizeToPixels. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertDialogSizeToPixels. Expected _wxSize_p.");
return NULL;
}
}
_result = new wxSize (wxWindow_ConvertDialogSizeToPixels(_arg0,*_arg1));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_ConvertPixelPointToDialog(_swigobj,_swigarg0) (_swigobj->ConvertPixelsToDialog(_swigarg0))
static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPoint * _result;
wxWindow * _arg0;
wxPoint * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelPointToDialog",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelPointToDialog. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelPointToDialog. Expected _wxPoint_p.");
return NULL;
}
}
_result = new wxPoint (wxWindow_ConvertPixelPointToDialog(_arg0,*_arg1));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_ConvertPixelSizeToDialog(_swigobj,_swigarg0) (_swigobj->ConvertPixelsToDialog(_swigarg0))
static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxSize * _result;
wxWindow * _arg0;
wxSize * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"ss:wxWindow_ConvertPixelSizeToDialog",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ConvertPixelSizeToDialog. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxSize_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_ConvertPixelSizeToDialog. Expected _wxSize_p.");
return NULL;
}
}
_result = new wxSize (wxWindow_ConvertPixelSizeToDialog(_arg0,*_arg1));
SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static void *SwigwxPanelTowxWindow(void *ptr) {
wxPanel *src;
wxWindow *dest;
@@ -4317,6 +4563,10 @@ static PyMethodDef windowscMethods[] = {
{ "new_wxDialog", _wrap_new_wxDialog, 1 },
{ "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 },
{ "new_wxPanel", _wrap_new_wxPanel, 1 },
{ "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 },
{ "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 },
{ "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 },
{ "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, 1 },
{ "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 },
{ "wxWindow_Validate", _wrap_wxWindow_Validate, 1 },
{ "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 },
@@ -4341,6 +4591,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, 1 },
{ "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, 1 },
{ "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 },
{ "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 },
{ "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 },
{ "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 },
{ "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 },
@@ -4360,14 +4611,17 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
{ "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
{ "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 },
{ "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 },
{ "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 },
{ "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 },
{ "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 },
{ "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 },
{ "wxWindow_GetRect", _wrap_wxWindow_GetRect, 1 },
{ "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
{ "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 },
{ "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 },
{ "wxWindow_GetName", _wrap_wxWindow_GetName, 1 },
{ "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, 1 },
{ "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 },
{ "wxWindow_GetId", _wrap_wxWindow_GetId, 1 },
{ "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, 1 },
{ "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, 1 },
@@ -4375,6 +4629,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_GetDefaultItem", _wrap_wxWindow_GetDefaultItem, 1 },
{ "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, 1 },
{ "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, 1 },
{ "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, 1 },
{ "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, 1 },
{ "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, 1 },
{ "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 },
@@ -4410,6 +4665,7 @@ SWIGEXPORT(void,initwindowsc)() {
*/
SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0);
SWIG_RegisterMapping("_signed_long","_long",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
@@ -4459,6 +4715,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_EBool","_signed_int",0);
SWIG_RegisterMapping("_EBool","_int",0);
SWIG_RegisterMapping("_EBool","_wxWindowID",0);
SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0);
SWIG_RegisterMapping("_wxFont","_class_wxFont",0);
SWIG_RegisterMapping("_unsigned_long","_wxDash",0);
SWIG_RegisterMapping("_unsigned_long","_long",0);
@@ -4529,6 +4786,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_int","_unsigned_int",0);
SWIG_RegisterMapping("_int","_signed_int",0);
SWIG_RegisterMapping("_wxSize","_class_wxSize",0);
SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0);
SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0);
SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0);
@@ -4536,6 +4794,7 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_class_wxColour","_wxColour",0);
SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0);
SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0);
SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0);
SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0);
SWIG_RegisterMapping("_class_wxSize","_wxSize",0);
SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0);

View File

@@ -4,7 +4,14 @@ import windowsc
from misc import *
from gdi import *
import wxp
import wx
def wxDLG_PNT(win, point):
return win.ConvertDialogPointToPixels(point)
def wxDLG_SZE(win, size):
return win.ConvertDialogPointToPixels(size)
class wxEvtHandlerPtr :
def __init__(self,this):
self.this = this
@@ -74,8 +81,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetCharWidth(self):
val = windowsc.wxWindow_GetCharWidth(self.this)
return val
def GetClientSizeTuple(self):
val = windowsc.wxWindow_GetClientSizeTuple(self.this)
return val
def GetClientSize(self):
val = windowsc.wxWindow_GetClientSize(self.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def GetConstraints(self):
val = windowsc.wxWindow_GetConstraints(self.this)
@@ -101,9 +113,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetId(self):
val = windowsc.wxWindow_GetId(self.this)
return val
def GetPosition(self):
val = windowsc.wxWindow_GetPosition(self.this)
return val
def GetLabel(self):
val = windowsc.wxWindow_GetLabel(self.this)
return val
@@ -114,6 +123,19 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = windowsc.wxWindow_GetParent(self.this)
val = wxWindowPtr(val)
return val
def GetPositionTuple(self):
val = windowsc.wxWindow_GetPositionTuple(self.this)
return val
def GetPosition(self):
val = windowsc.wxWindow_GetPosition(self.this)
val = wxPointPtr(val)
val.thisown = 1
return val
def GetRect(self):
val = windowsc.wxWindow_GetRect(self.this)
val = wxRectPtr(val)
val.thisown = 1
return val
def GetReturnCode(self):
val = windowsc.wxWindow_GetReturnCode(self.this)
return val
@@ -126,8 +148,13 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetScrollRange(self,arg0):
val = windowsc.wxWindow_GetScrollRange(self.this,arg0)
return val
def GetSizeTuple(self):
val = windowsc.wxWindow_GetSizeTuple(self.this)
return val
def GetSize(self):
val = windowsc.wxWindow_GetSize(self.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def GetTextExtent(self,arg0):
val = windowsc.wxWindow_GetTextExtent(self.this,arg0)
@@ -191,6 +218,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
args = tuple(argl)
val = apply(windowsc.wxWindow_ScrollWindow,(self.this,arg0,arg1,)+args)
return val
def SetAcceleratorTable(self,arg0):
val = windowsc.wxWindow_SetAcceleratorTable(self.this,arg0.this)
return val
def SetAutoLayout(self,arg0):
val = windowsc.wxWindow_SetAutoLayout(self.this,arg0)
return val
@@ -263,6 +293,26 @@ class wxWindowPtr(wxEvtHandlerPtr):
def WarpPointer(self,arg0,arg1):
val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1)
return val
def ConvertDialogPointToPixels(self,arg0):
val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this)
val = wxPointPtr(val)
val.thisown = 1
return val
def ConvertDialogSizeToPixels(self,arg0):
val = windowsc.wxWindow_ConvertDialogSizeToPixels(self.this,arg0.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def ConvertPixelPointToDialog(self,arg0):
val = windowsc.wxWindow_ConvertPixelPointToDialog(self.this,arg0.this)
val = wxPointPtr(val)
val.thisown = 1
return val
def ConvertPixelSizeToDialog(self,arg0):
val = windowsc.wxWindow_ConvertPixelSizeToDialog(self.this,arg0.this)
val = wxSizePtr(val)
val.thisown = 1
return val
def __repr__(self):
return "<C wxWindow instance>"
class wxWindow(wxWindowPtr):
@@ -275,7 +325,7 @@ class wxWindow(wxWindowPtr):
args = tuple(argl)
self.this = apply(windowsc.new_wxWindow,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -299,7 +349,7 @@ class wxPanel(wxPanelPtr):
args = tuple(argl)
self.this = apply(windowsc.new_wxPanel,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -350,7 +400,7 @@ class wxDialog(wxDialogPtr):
args = tuple(argl)
self.this = apply(windowsc.new_wxDialog,(arg0.this,arg1,arg2,)+args)
self.thisown = 1
wxp._StdDialogCallbacks(self)
wx._StdDialogCallbacks(self)
@@ -395,8 +445,8 @@ class wxScrolledWindow(wxScrolledWindowPtr):
args = tuple(argl)
self.this = apply(windowsc.new_wxScrolledWindow,(arg0.this,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wxp._StdOnScrollCallbacks(self)
wx._StdWindowCallbacks(self)
wx._StdOnScrollCallbacks(self)

View File

@@ -230,7 +230,8 @@ static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxFont *)wxGridCell_GetFont(_arg0);
wxFont & _result_ref = wxGridCell_GetFont(_arg0);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -259,7 +260,7 @@ static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args) {
return NULL;
}
}
wxGridCell_SetFont(_arg0,_arg1);
wxGridCell_SetFont(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -388,7 +389,8 @@ static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *a
return NULL;
}
}
_result = (wxBrush *)wxGridCell_GetBackgroundBrush(_arg0);
wxBrush & _result_ref = wxGridCell_GetBackgroundBrush(_arg0);
_result = (wxBrush *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -1021,7 +1023,8 @@ static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxFont *)wxGrid_GetCellTextFont(_arg0,_arg1,_arg2);
wxFont & _result_ref = wxGrid_GetCellTextFont(_arg0,_arg1,_arg2);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -1044,7 +1047,8 @@ static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args)
return NULL;
}
}
_result = (wxFont *)wxGrid_GetDefCellTextFont(_arg0);
wxFont & _result_ref = wxGrid_GetDefCellTextFont(_arg0);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -1338,7 +1342,8 @@ static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
return NULL;
}
}
_result = (wxFont *)wxGrid_GetLabelTextFont(_arg0);
wxFont & _result_ref = wxGrid_GetLabelTextFont(_arg0);
_result = (wxFont *) &_result_ref;
SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
@@ -1768,7 +1773,7 @@ static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
return NULL;
}
}
wxGrid_SetCellTextFont(_arg0,_arg1,_arg2,_arg3);
wxGrid_SetCellTextFont(_arg0,*_arg1,_arg2,_arg3);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1797,7 +1802,7 @@ static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args)
return NULL;
}
}
wxGrid_SetDefCellTextFont(_arg0,_arg1);
wxGrid_SetDefCellTextFont(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -1885,7 +1890,7 @@ static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args) {
return NULL;
}
}
wxGrid_SetDividerPen(_arg0,_arg1);
wxGrid_SetDividerPen(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
@@ -2065,7 +2070,7 @@ static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args) {
return NULL;
}
}
wxGrid_SetLabelTextFont(_arg0,_arg1);
wxGrid_SetLabelTextFont(_arg0,*_arg1);
Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;

View File

@@ -10,7 +10,7 @@ from windows import *
from controls import *
from events import *
import wxp
import wx
class wxGridCellPtr :
def __init__(self,this):
self.this = this
@@ -294,16 +294,16 @@ class wxGrid(wxGridPtr):
args = tuple(argl)
self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)
wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)
wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)
wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)
wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)
wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)
wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)
wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)
wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)
wx._StdWindowCallbacks(self)
wx._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)
wx._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)
wx._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)
wx._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)
wx._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)
wx._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)
wx._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)
wx._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)
wx._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)
@@ -443,7 +443,7 @@ class wxNotebook(wxNotebookPtr):
args = tuple(argl)
self.this = apply(windows2c.new_wxNotebook,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -521,7 +521,7 @@ class wxSplitterWindow(wxSplitterWindowPtr):
args = tuple(argl)
self.this = apply(windows2c.new_wxSplitterWindow,(arg0.this,arg1,)+args)
self.thisown = 1
wxp._StdWindowCallbacks(self)
wx._StdWindowCallbacks(self)
@@ -545,13 +545,13 @@ class wxTaskBarIcon(wxTaskBarIconPtr):
def __init__(self) :
self.this = windows2c.new_wxTaskBarIcon()
self.thisown = 1
wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)
wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)
wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)
wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)
wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)
wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)
wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)
wx._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)
wx._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)
wx._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)
wx._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)
wx._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)
wx._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)
wx._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)

View File

@@ -1,5 +1,5 @@
/*
* FILE : msw/wxp.cpp
* FILE : msw/wx.cpp
*
* This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG)
@@ -33,10 +33,24 @@
* and things like that.
*
* $Log$
* Revision 1.6 1998/11/25 08:46:46 RD
* Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
* Added events for wxGrid
* Other various fixes and additions
* Revision 1.1 1998/12/15 20:44:01 RD
* Changed the import semantics from "from wxPython import *" to "from
* wxPython.wx import *" This is for people who are worried about
* namespace pollution, they can use "from wxPython import wx" and then
* prefix all the wxPython identifiers with "wx."
*
* Added wxTaskbarIcon for wxMSW.
*
* Made the events work for wxGrid.
*
* Added wxConfig.
*
* Added wxMiniFrame for wxGTK, (untested.)
*
* Changed many of the args and return values that were pointers to gdi
* objects to references to reflect changes in the wxWindows API.
*
* Other assorted fixes and additions.
*
************************************************************************/
@@ -554,9 +568,9 @@ char *SWIG_GetPtr(char *_c, void **ptr, char *_t)
#define _swig_get_hex SWIG_GetPtr
#define SWIG_init initwxpc
#define SWIG_init initwxc
#define SWIG_name "wxpc"
#define SWIG_name "wxc"
#include "helpers.h"
@@ -630,6 +644,7 @@ extern "C" SWIGEXPORT(void,initcontrols2c)();
extern "C" SWIGEXPORT(void,initcmndlgsc)();
extern "C" SWIGEXPORT(void,initstattoolc)();
extern "C" SWIGEXPORT(void,initframesc)();
extern "C" SWIGEXPORT(void,initutilsc)();
static int _wrap_wxPyDefaultPosition_set(PyObject *val) {
@@ -1179,7 +1194,7 @@ static PyObject *_wrap_wxPyApp_AfterMainLoop(PyObject *self, PyObject *args) {
return _resultobj;
}
static PyMethodDef wxpcMethods[] = {
static PyMethodDef wxcMethods[] = {
{ "wxPyApp_AfterMainLoop", _wrap_wxPyApp_AfterMainLoop, 1 },
{ "wxPyApp_SetVendorName", _wrap_wxPyApp_SetVendorName, 1 },
{ "wxPyApp_SetTopWindow", _wrap_wxPyApp_SetTopWindow, 1 },
@@ -1209,10 +1224,10 @@ static PyObject *SWIG_globals;
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void,initwxpc)() {
SWIGEXPORT(void,initwxc)() {
PyObject *m, *d;
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("wxpc", wxpcMethods);
m = Py_InitModule("wxc", wxcMethods);
d = PyModule_GetDict(m);
PyDict_SetItemString(d,"wxMAJOR_VERSION", PyInt_FromLong((long) wxMAJOR_VERSION));
PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long) wxMINOR_VERSION));
@@ -1252,6 +1267,7 @@ SWIGEXPORT(void,initwxpc)() {
PyDict_SetItemString(d,"wxDIALOG_MODELESS", PyInt_FromLong((long) wxDIALOG_MODELESS));
PyDict_SetItemString(d,"wxDEFAULT_FRAME_STYLE", PyInt_FromLong((long) wxDEFAULT_FRAME_STYLE));
PyDict_SetItemString(d,"wxDEFAULT_DIALOG_STYLE", PyInt_FromLong((long) wxDEFAULT_DIALOG_STYLE));
PyDict_SetItemString(d,"wxFRAME_TOOL_WINDOW", PyInt_FromLong((long) wxFRAME_TOOL_WINDOW));
PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED));
PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE));
PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
@@ -1723,7 +1739,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.4.2"));
PyDict_SetItemString(d,"__version__", PyString_FromString("0.4.5"));
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);
@@ -1747,7 +1763,9 @@ SWIGEXPORT(void,initwxpc)() {
initcmndlgsc();
initstattoolc();
initframesc();
#ifndef SEPARATE
initutilsc();
#endif
/*
* These are the pointer type-equivalency mappings.
* (Used by the SWIG pointer type-checker).
@@ -1841,6 +1859,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0);
SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0);
SWIG_RegisterMapping("_wxConfig","_class_wxConfig",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
@@ -2017,6 +2036,7 @@ SWIGEXPORT(void,initwxpc)() {
SWIG_RegisterMapping("_wxDash","_long",0);
SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0);
SWIG_RegisterMapping("_class_wxTextEntryDialog","_wxTextEntryDialog",0);
SWIG_RegisterMapping("_class_wxConfig","_wxConfig",0);
SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0);
SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0);
SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0);

1241
utils/wxPython/src/msw/wx.py Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -30,6 +30,7 @@
%import windows.i
%import controls.i
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
@@ -41,7 +42,7 @@ public:
long style = wxST_SIZEGRIP,
char* name = "statusBar");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
%addmethods {
%new wxRect* GetFieldRect(long item) {
@@ -110,7 +111,7 @@ public:
long style = wxTB_HORIZONTAL | wxNO_BORDER,
char* name = "toolBar");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void AddSeparator(void);
@@ -184,7 +185,7 @@ public:
// long style = wxTB_HORIZONTAL | wxNO_BORDER,
// char* name = "toolBar");
// %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
// %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
// };
@@ -198,7 +199,7 @@ public:
// long style = wxTB_HORIZONTAL | wxNO_BORDER,
// char* name = "toolBar");
// %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
// %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
// };
@@ -208,6 +209,25 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.3 1998/12/15 20:41:23 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.2 1998/10/07 07:34:34 RD
// Version 0.4.1 for wxGTK
//

159
utils/wxPython/src/utils.i Normal file
View File

@@ -0,0 +1,159 @@
/////////////////////////////////////////////////////////////////////////////
// Name: utils.i
// Purpose: SWIG definitions of various utility classes classes
//
// Author: Robin Dunn
//
// Created: 25-nov-1998
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module utils
%{
#include "helpers.h"
#include <wx/config.h>
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
#ifdef SEPARATE
%{
static wxString wxPyEmptyStr("");
%}
#endif
%{
static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
PyObject* ret = PyTuple_New(3);
if (ret) {
PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
PyTuple_SET_ITEM(ret, 1, PyString_FromString(str));
PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
}
return ret;
}
%}
//---------------------------------------------------------------------------
class wxConfig {
public:
wxConfig(const wxString& appName = wxPyEmptyStr,
const wxString& vendorName = wxPyEmptyStr,
const wxString& localFilename = wxPyEmptyStr,
const wxString& globalFilename = wxPyEmptyStr,
long style = 0);
~wxConfig();
//static wxConfigBase * Create();
//static wxConfigBase * Get();
//static wxConfigBase * Set(wxConfigBase *pConfig);
void DontCreateOnDemand();
// **** DANGER Will Robinson! DANGER! bool DeleteAll();
bool DeleteEntry(const wxString& key, bool bDeleteGroupIfEmpty = TRUE);
bool DeleteGroup(const wxString& key);
bool Exists(wxString& strName);
bool Flush(bool bCurrentOnly = FALSE);
wxString GetAppName();
// Each of these enumeration methods return a 3-tuple consisting of
// the continue flag, the value string, and the index for the next call.
%addmethods {
PyObject* GetFirstGroup() {
bool cont;
long index = 0;
wxString value;
cont = self->GetFirstGroup(value, index);
return __EnumerationHelper(cont, value, index);
}
PyObject* GetFirstEntry() {
bool cont;
long index = 0;
wxString value;
cont = self->GetFirstEntry(value, index);
return __EnumerationHelper(cont, value, index);
}
PyObject* GetNextGroup(long index) {
bool cont;
wxString value;
cont = self->GetNextGroup(value, index);
return __EnumerationHelper(cont, value, index);
}
PyObject* GetNextEntry(long index) {
bool cont;
wxString value;
cont = self->GetNextEntry(value, index);
return __EnumerationHelper(cont, value, index);
}
}
int GetNumberOfEntries(bool bRecursive = FALSE);
int GetNumberOfGroups(bool bRecursive = FALSE);
wxString GetPath();
wxString GetVendorName();
bool HasEntry(wxString& strName);
bool HasGroup(const wxString& strName);
bool IsExpandingEnvVars();
bool IsRecordingDefaults();
wxString Read(const wxString& key, const wxString& defaultVal = wxPyEmptyStr);
%name(ReadInt)long Read(const wxString& key, long defaultVal = 0);
%name(ReadFloat)double Read(const wxString& key, double defaultVal = 0.0);
void SetAppName(const wxString& appName);
void SetExpandEnvVars (bool bDoIt = TRUE);
void SetPath(const wxString& strPath);
void SetRecordDefaults(bool bDoIt = TRUE);
void SetVendorName(const wxString& vendorName);
bool Write(const wxString& key, const wxString& value);
%name(WriteInt)bool Write(const wxString& key, long value);
%name(WriteFloat)bool Write(const wxString& key, double value);
};
//---------------------------------------------------------------------------
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.1 1998/12/15 20:41:23 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//

View File

@@ -0,0 +1,2 @@
EXPORTS
initutilsc

View File

@@ -36,7 +36,7 @@
%import misc.i
%import gdi.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
@@ -66,7 +66,7 @@ public:
long style = 0,
char* name = "panel");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void CaptureMouse();
void Center(int direction = wxHORIZONTAL);
@@ -86,25 +86,29 @@ public:
wxColour GetBackgroundColour();
int GetCharHeight();
int GetCharWidth();
void GetClientSize(int *OUTPUT, int *OUTPUT);
%name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
wxSize GetClientSize();
wxLayoutConstraints * GetConstraints();
#ifdef __WXMSW__
wxButton* GetDefaultItem();
#endif
//wxEvtHandler* GetEventHandler();
wxFont* GetFont();
wxFont& GetFont();
wxColour GetForegroundColour();
wxWindow * GetGrandParent();
int GetId();
void GetPosition(int *OUTPUT, int *OUTPUT);
wxString GetLabel();
wxString GetName();
wxWindow * GetParent();
%name(GetPositionTuple) void GetPosition(int *OUTPUT, int *OUTPUT);
wxPoint GetPosition();
wxRect GetRect();
int GetReturnCode();
int GetScrollThumb(int orientation);
int GetScrollPos(int orientation);
int GetScrollRange(int orientation);
void GetSize(int *OUTPUT, int *OUTPUT);
%name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
wxSize GetSize();
void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE)
wxString GetTitle();
long GetWindowStyleFlag();
@@ -127,6 +131,7 @@ public:
void ReleaseMouse();
void ScreenToClient(int *BOTH, int *BOTH);
void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
void SetAcceleratorTable(const wxAcceleratorTable& accel);
void SetAutoLayout(bool autoLayout);
void SetBackgroundColour(const wxColour& colour);
void SetConstraints(wxLayoutConstraints *constraints);
@@ -157,7 +162,6 @@ public:
void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
void SetClientSize(int width, int height);
//void SetPalette(wxPalette* palette);
//void SetColourMap(wxColourMap *colourMap);
void SetCursor(const wxCursor&cursor);
//void SetEventHandler(wxEvtHandler* handler);
void SetTitle(const wxString& title);
@@ -169,8 +173,21 @@ public:
void WarpPointer(int x, int y);
#endif
%name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
%name(ConvertDialogSizeToPixels) wxSize ConvertDialogToPixels(const wxSize& sz);
%name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
%name(ConvertPixelSizeToDialog) wxSize ConvertPixelsToDialog(const wxSize& sz);
};
%pragma(python) code = "
def wxDLG_PNT(win, point):
return win.ConvertDialogPointToPixels(point)
def wxDLG_SZE(win, size):
return win.ConvertDialogPointToPixels(size)
"
// Static method(s)
#ifdef __WXMSW__
@@ -193,7 +210,7 @@ public:
long style = wxTAB_TRAVERSAL,
const char* name = "panel");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void InitDialog();
};
@@ -210,7 +227,7 @@ public:
long style = wxDEFAULT_DIALOG_STYLE,
const char* name = "dialogBox");
%pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
void Centre(int direction = wxBOTH);
void EndModal(int retCode);
@@ -235,8 +252,8 @@ public:
long style = wxHSCROLL | wxVSCROLL,
char* name = "scrolledWindow");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wxp._StdOnScrollCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdOnScrollCallbacks(self)"
void EnableScrolling(bool xScrolling, bool yScrolling);
void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
@@ -347,7 +364,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.7 1998/12/15 20:41:25 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.6 1998/10/02 06:40:43 RD
//
// Version 0.4 of wxPython for MSW.
//
// Revision 1.5 1998/08/17 18:29:40 RD

View File

@@ -35,7 +35,7 @@
%import controls.i
%import events.i
%pragma(python) code = "import wxp"
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
@@ -53,13 +53,13 @@ public:
wxString& GetTextValue();
void SetTextValue(const wxString& str);
wxFont* GetFont();
void SetFont(wxFont *f);
wxFont& GetFont();
void SetFont(wxFont& f);
wxColour& GetTextColour();
void SetTextColour(const wxColour& colour);
wxColour& GetBackgroundColour();
void SetBackgroundColour(const wxColour& colour);
wxBrush* GetBackgroundBrush();
wxBrush& GetBackgroundBrush();
int GetAlignment();
void SetAlignment(int align);
wxBitmap* GetCellBitmap();
@@ -77,16 +77,16 @@ public:
long style=0,
char* name="grid");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)"
void AdjustScrollbars();
@@ -124,8 +124,8 @@ public:
//wxGridCell *** GetCells();
wxColour& GetCellTextColour(int row, int col);
%name(GetDefCellTextColour)wxColour& GetCellTextColour();
wxFont* GetCellTextFont(int row, int col);
%name(GetDefCellTextFont)wxFont* GetCellTextFont();
wxFont& GetCellTextFont(int row, int col);
%name(GetDefCellTextFont)wxFont& GetCellTextFont();
wxString& GetCellValue(int row, int col);
int GetCols();
int GetColumnWidth(int col);
@@ -138,7 +138,7 @@ public:
wxColour& GetLabelBackgroundColour();
int GetLabelSize(int orientation);
wxColour& GetLabelTextColour();
wxFont* GetLabelTextFont();
wxFont& GetLabelTextFont();
wxString& GetLabelValue(int orientation, int pos);
int GetRowHeight(int row);
int GetRows();
@@ -159,18 +159,18 @@ public:
void SetCellBackgroundColour(const wxColour& colour);
void SetCellTextColour(const wxColour& colour, int row, int col);
%name(SetDefCellTextColour)void SetCellTextColour(const wxColour& colour);
void SetCellTextFont(wxFont *font, int row, int col);
%name(SetDefCellTextFont)void SetCellTextFont(wxFont *font);
void SetCellTextFont(wxFont& font, int row, int col);
%name(SetDefCellTextFont)void SetCellTextFont(wxFont& font);
void SetCellValue(const wxString& val, int row, int col);
void SetColumnWidth(int col, int width);
void SetDividerPen(wxPen *pen);
void SetDividerPen(wxPen& pen);
void SetEditable(bool editable);
void SetGridCursor(int row, int col);
void SetLabelAlignment(int orientation, int alignment);
void SetLabelBackgroundColour(const wxColour& value);
void SetLabelSize(int orientation, int size);
void SetLabelTextColour(const wxColour& value);
void SetLabelTextFont(wxFont *font);
void SetLabelTextFont(wxFont& font);
void SetLabelValue(int orientation, const wxString& value, int pos);
void SetRowHeight(int row, int height);
@@ -222,7 +222,7 @@ public:
long style = 0,
char* name = "notebook");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
int GetPageCount();
int SetSelection(int nPage);
@@ -265,7 +265,7 @@ public:
long style=wxSP_3D|wxCLIP_CHILDREN,
char* name = "splitterWindow");
%pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
int GetBorderSize();
int GetMinimumPaneSize();
@@ -314,13 +314,13 @@ public:
wxTaskBarIcon();
~wxTaskBarIcon();
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)"
%pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)"
%pragma(python) addtomethod = "__init__:wx._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)"
bool SetIcon(const wxIcon& icon, const char* tooltip = "");
bool RemoveIcon(void);
@@ -331,7 +331,27 @@ public:
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.7 1998/12/15 20:41:25 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.6 1998/11/25 08:45:28 RD
//
// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
// Added events for wxGrid
// Other various fixes and additions

View File

@@ -10,7 +10,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module wxp
%module wx
%{
@@ -36,7 +36,9 @@
%import cmndlgs.i
%import stattool.i
%import frames.i
#ifndef SEPARATE
%import utils.i
#endif
%native(_wxStart) __wxStart;
@@ -44,7 +46,7 @@
//---------------------------------------------------------------------------
#define __version__ "0.4.2"
#define __version__ "0.5.0"
wxPoint wxPyDefaultPosition;
wxSize wxPyDefaultSize;
@@ -111,6 +113,7 @@ extern "C" SWIGEXPORT(void,initcontrols2c)();
extern "C" SWIGEXPORT(void,initcmndlgsc)();
extern "C" SWIGEXPORT(void,initstattoolc)();
extern "C" SWIGEXPORT(void,initframesc)();
extern "C" SWIGEXPORT(void,initutilsc)();
%}
@@ -134,7 +137,9 @@ extern "C" SWIGEXPORT(void,initframesc)();
initcmndlgsc();
initstattoolc();
initframesc();
#ifndef SEPARATE
initutilsc();
#endif
%}
//----------------------------------------------------------------------
@@ -147,6 +152,25 @@ extern "C" SWIGEXPORT(void,initframesc)();
/////////////////////////////////////////////////////////////////////////////
//
// $Log$
// Revision 1.1 1998/12/15 20:41:27 RD
// Changed the import semantics from "from wxPython import *" to "from
// wxPython.wx import *" This is for people who are worried about
// namespace pollution, they can use "from wxPython import wx" and then
// prefix all the wxPython identifiers with "wx."
//
// Added wxTaskbarIcon for wxMSW.
//
// Made the events work for wxGrid.
//
// Added wxConfig.
//
// Added wxMiniFrame for wxGTK, (untested.)
//
// Changed many of the args and return values that were pointers to gdi
// objects to references to reflect changes in the wxWindows API.
//
// Other assorted fixes and additions.
//
// Revision 1.9 1998/10/20 07:38:04 RD
// bug fix
//

View File

@@ -0,0 +1,2 @@
EXPORTS
initwxc

View File

@@ -1,2 +0,0 @@
EXPORTS
initwxpc

View File

@@ -12,7 +12,7 @@
#----------------------------------------------------------------------------
from wxPython import *
from wxPython.wx import *
#---------------------------------------------------------------------------
@@ -65,7 +65,27 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.3 1998/12/15 20:44:34 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.2 1998/10/02 06:42:27 RD
#
# Version 0.4 of wxPython for MSW.
#
# Revision 1.1 1998/08/09 08:28:05 RD

View File

@@ -12,7 +12,7 @@
#----------------------------------------------------------------------------
from wxPython import *
from wxPython.wx import *
#---------------------------------------------------------------------------
@@ -23,6 +23,7 @@ class MyCanvas(wxWindow):
def __init__(self, parent):
wxWindow.__init__(self, parent, -1, wxPoint(0, 0), wxPyDefaultSize, wxSUNKEN_BORDER)
self.SetBackgroundColour(wxNamedColor("WHITE"))
self.Connect(-1, -1, wxEVT_LEFT_DOWN, self.OnLeftButtonEvent)
self.Connect(-1, -1, wxEVT_LEFT_UP, self.OnLeftButtonEvent)
self.Connect(-1, -1, wxEVT_MOTION, self.OnLeftButtonEvent)
@@ -118,9 +119,8 @@ class MyFrame(wxFrame):
self.Destroy()
def OnSize(self, event):
w,h = self.GetClientSize()
#self.canvas.SetSize(5, 5, w-10, h-10)
self.canvas.SetDimensions(0, 0, w, h)
size = self.GetClientSize()
self.canvas.SetDimensions(5, 5, size.width-10, size.height-10)
#---------------------------------------------------------------------------
@@ -152,6 +152,25 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.2 1998/12/15 20:44:34 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.1 1998/08/09 08:28:05 RD
# Initial version
#

View File

@@ -12,21 +12,25 @@
#----------------------------------------------------------------------------
from wxPython import *
from wxPython.wx import *
#---------------------------------------------------------------------------
class MyCanvas(wxWindow):
def __init__(self, parent, ID):
wxWindow.__init__(self, parent, ID)
self.SetBackgroundColour(wxNamedColor("WHITE"))
def OnPaint(self, event):
dc = wxPaintDC(self)
dc.BeginDrawing()
w, h = self.GetClientSize()
size = self.GetClientSize()
font = wxFont(42, wxSWISS, wxNORMAL, wxNORMAL)
dc.SetFont(font)
st = "Python Rules!"
tw,th, d,e = dc.GetTextExtent(st)
dc.DrawText(st, (w-tw)/2, (h-th)/2)
dc.DrawText(st, (size.width-tw)/2, (size.height-th)/2)
dc.EndDrawing()
#---------------------------------------------------------------------------
@@ -54,7 +58,7 @@ class MyFrame(wxFrame):
wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
wxSize(420, 200))
self.canvas = MyCanvas(self, -1)
self.CreateStatusBar(3)
self.CreateStatusBar(2)
mainmenu = wxMenuBar()
menu = wxMenu()
menu.Append(100, 'A &Menu Item', 'the help text')
@@ -80,9 +84,9 @@ class MyFrame(wxFrame):
def OnSize(self, event):
w,h = self.GetClientSize()
self.canvas.SetSize(wxSize(w, h))
self.SetStatusText("hello, this is a test: (%d, %d)" % (w,h))
size = self.GetClientSize()
self.canvas.SetSize(size)
self.SetStatusText("hello, this is a test: (%d, %d)" % (size.width, size.height), 1)
## def OnMenuHighlight(self, event):
## mainmenu = self.GetMenuBar()
@@ -143,6 +147,25 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.3 1998/12/15 20:44:35 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.2 1998/08/22 19:51:17 RD
# some tweaks for wxGTK
#

View File

@@ -12,7 +12,7 @@
#----------------------------------------------------------------------------
from wxPython import *
from wxPython.wx import *
import time
@@ -43,7 +43,7 @@ class TestSimpleControlsDlg(wxDialog):
rb = wxRadioBox(self, 30, "wxRadioBox", wxPoint(80, y_pos), wxPyDefaultSize,
sampleList, 3, wxRA_HORIZONTAL| wxNO_BORDER)
EVT_RADIOBOX(self, 30, self.EvtRadioBox)
width, height = rb.GetSize()
width, height = rb.GetSizeTuple()
y_pos = y_pos + height + 5
wxStaticText(self, -1, "wxChoice", wxPoint(5, y_pos), wxSize(75, 20))
@@ -64,7 +64,7 @@ class TestSimpleControlsDlg(wxDialog):
EVT_LISTBOX(self, 60, self.EvtListBox)
EVT_LISTBOX_DCLICK(self, 60, self.EvtListBoxDClick)
lb.SetSelection(0)
width, height = lb.GetSize()
width, height = lb.GetSizeTuple()
y_pos = y_pos + height + 5
@@ -374,7 +374,7 @@ class TestCustomStatusBar(wxFrame):
def __init__(self, parent):
wxFrame.__init__(self, parent, -1, 'Test Custom StatusBar',
wxPyDefaultPosition, wxSize(500, 300))
wxWindow(self, -1)
wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
self.sb = CustomStatusBar(self)
self.SetStatusBar(self.sb)
@@ -392,9 +392,9 @@ class TestToolBar(wxFrame):
wxPyDefaultPosition, wxSize(500, 300))
self.log = log
wxWindow(self, -1)
wxWindow(self, -1).SetBackgroundColour(wxNamedColour("WHITE"))
tb = self.CreateToolBar()
tb = self.CreateToolBar(wxTB_HORIZONTAL|wxNO_BORDER)
#tb = wxToolBar(self, -1, wxPyDefaultPosition, wxPyDefaultSize,
# wxTB_HORIZONTAL | wxNO_BORDER | wxTB_FLAT)
#self.SetToolBar(tb)
@@ -469,7 +469,7 @@ class TestTreeCtrlPanel(wxPanel):
def OnSize(self, event):
w,h = self.GetClientSize()
w,h = self.GetClientSizeTuple()
self.tree.SetDimensions(0, 0, w, h)
@@ -616,7 +616,7 @@ class AppFrame(wxFrame):
def WriteText(self, str):
self.log.WriteText(str)
if wxPlatform == '__WXMSW__':
w, h = self.log.GetClientSize()
w, h = self.log.GetClientSizeTuple()
numLines = h/self.charHeight
x, y = self.log.PositionToXY(self.log.GetLastPosition())
self.log.ShowPosition(self.log.XYToPosition(x, y-numLines+1))
@@ -803,7 +803,27 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.9 1998/12/15 20:44:35 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.8 1998/11/25 08:47:11 RD
#
# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
# Added events for wxGrid
# Other various fixes and additions

View File

@@ -12,7 +12,7 @@
#----------------------------------------------------------------------------
from wxPython import *
from wxPython.wx import *
#---------------------------------------------------------------------------
@@ -91,7 +91,27 @@ if __name__ == '__main__':
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.2 1998/12/15 20:44:36 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
# Revision 1.1 1998/11/25 08:47:12 RD
#
# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon
# Added events for wxGrid
# Other various fixes and additions

View File

@@ -0,0 +1,103 @@
#!/bin/env python
#----------------------------------------------------------------------------
# Name: test6.py
# Purpose: Testing wxConfig
#
# Author: Robin Dunn
#
# Created: 26-Nov-1998
# RCS-ID: $Id$
# Copyright: (c) 1998 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------------
import sys
from wxPython.wx import wxConfig
#----------------------------------------------------------------------------
def main():
cfg = wxConfig('test6', 'TCS')
cmd = ''
if len(sys.argv) > 1:
cmd = sys.argv[1]
if cmd == 'add':
cfg.SetPath('one/two/three')
cfg.Flush()
cfg.Write('aaa', 'The quick brown fox jummped over the lazy dog.')
cfg.Write('bbb', 'This is a test of the emergency broadcast system')
aList = ['one', 'two', 'buckle', 'my', 'shoe', 1966]
cfg.Write('ccc', str(aList))
cfg.Write('zzz/yyy', 'foobar')
cfg.Write('zzz/xxx', 'spam and eggs')
cfg.Flush()
elif cmd == 'enum':
traverse(cfg, '/')
elif cmd == 'del':
cfg.DeleteAll()
else:
print 'Specify command: add, enum, or del.'
def traverse(cfg, path):
print path
cont, val, idx = cfg.GetFirstEntry()
while cont:
print "%s/%s = %s" % (path, val, cfg.Read(val))
cont, val, idx = cfg.GetNextEntry(idx)
cont, val, idx = cfg.GetFirstGroup()
while cont:
if path == '/':
newpath = path+val
else:
newpath = path+'/'+val
cfg.SetPath(newpath)
traverse(cfg, newpath)
cfg.SetPath(path)
cont, val, idx = cfg.GetNextGroup(idx)
if __name__ == '__main__':
#import pdb
#pdb.run('main()')
main()
#----------------------------------------------------------------------------
#
# $Log$
# Revision 1.1 1998/12/15 20:44:37 RD
# Changed the import semantics from "from wxPython import *" to "from
# wxPython.wx import *" This is for people who are worried about
# namespace pollution, they can use "from wxPython import wx" and then
# prefix all the wxPython identifiers with "wx."
#
# Added wxTaskbarIcon for wxMSW.
#
# Made the events work for wxGrid.
#
# Added wxConfig.
#
# Added wxMiniFrame for wxGTK, (untested.)
#
# Changed many of the args and return values that were pointers to gdi
# objects to references to reflect changes in the wxWindows API.
#
# Other assorted fixes and additions.
#
#