Hi,
I've attached a patch that allows to build the latest svn revision
(r60768 at the time of writing). Note that this is really just a
simple build fix. For instance, the *IsDown / *Down functions in
_event.i would require some further changes to be properly
implemented.
Best,
Christoph
Index: src/_event.i
···
===================================================================
--- src/_event.i (revision 60768)
+++ src/_event.i (working copy)
@@ -874,11 +874,11 @@
wxCoord GetX();
wxCoord GetY();
- bool LeftDown();
- bool MiddleDown();
- bool RightDown();
- bool Aux1Down();
- bool Aux2Down();
+ bool LeftIsDown();
+ bool MiddleIsDown();
+ bool RightIsDown();
+ bool Aux1IsDown();
+ bool Aux2IsDown();
bool ControlDown();
bool ShiftDown();
@@ -903,11 +903,11 @@
%pythoncode {
x = property(GetX, SetX)
y = property(GetY, SetY)
- leftDown = property(LeftDown, SetLeftDown)
- middleDown = property(MiddleDown, SetMiddleDown)
- rightDown = property(RightDown, SetRightDown)
- aux1Down = property(Aux1Down, SetAux1Down)
- aux2Down = property(Aux2Down, SetAux2Down)
+ leftDown = property(LeftIsDown, SetLeftDown)
+ middleDown = property(MiddleIsDown, SetMiddleDown)
+ rightDown = property(RightIsDown, SetRightDown)
+ aux1Down = property(Aux1IsDown, SetAux1Down)
+ aux2Down = property(Aux2IsDown, SetAux2Down)
controlDown = property(ControlDown, SetControlDown)
shiftDown = property(ShiftDown, SetShiftDown)
altDown = property(AltDown, SetAltDown)
@@ -1061,7 +1061,7 @@
// Was the given button in Down state?
- bool ButtonIsDown(int but) const;
+ bool ButtonIsDown(wxMouseButton but) const;
DocDeclStr(
int , GetButton() const,
@@ -1075,23 +1075,23 @@
DocDeclStr(
- bool , LeftDown() const,
+ bool , LeftIsDown() const,
"Returns true if the left mouse button state changed to
down.", "");
DocDeclStr(
- bool , MiddleDown() const,
+ bool , MiddleIsDown() const,
"Returns true if the middle mouse button state changed to
down.", "");
DocDeclStr(
- bool , RightDown() const,
+ bool , RightIsDown() const,
"Returns true if the right mouse button state changed to
down.", "");
DocDeclStr(
- bool , Aux1Down() const,
+ bool , Aux1IsDown() const,
"Returns true if the AUX1 mouse button state changed to
down.", "");
DocDeclStr(
- bool , Aux2Down() const,
+ bool , Aux2IsDown() const,
"Returns true if the AUX2 mouse button state changed to
down.", "");
Index: src/_evthandler.i
--- src/_evthandler.i (revision 60768)
+++ src/_evthandler.i (working copy)
@@ -93,7 +93,7 @@
if ((entry->m_id == id) &&
((entry->m_lastId == lastId) || (lastId ==
wxID_ANY)) &&
((entry->m_eventType == eventType) ||
(eventType == wxEVT_NULL)) &&
- ((entry->m_fn->GetMethod() ==
(wxObjectEventFunction)&wxPyCallback::EventThunker)) &&
+ ((entry->m_fn->GetEvtMethod() ==
(wxObjectEventFunction)&wxPyCallback::EventThunker)) &&
(entry->m_callbackUserData != NULL))
{
wxPyCallback *cb = (wxPyCallback*)entry-
m_callbackUserData;
Index: src/_graphics.i
--- src/_graphics.i (revision 60768)
+++ src/_graphics.i (working copy)
@@ -344,12 +344,13 @@
"wx.GraphicsRenderer is not available on this
platform.");
return NULL;
}
+#if 0
static wxGraphicsRenderer* GetCairoRenderer() {
PyErr_SetString(PyExc_NotImplementedError,
"wx.GraphicsRenderer is not available on this
platform.");
return NULL;
}
-
+#endif
virtual wxGraphicsContext * CreateContext( const wxWindowDC& )
{ return NULL; }
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& )
{ return NULL; }
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& )
{ return NULL; }
@@ -1178,7 +1179,9 @@
// %newobject GetDefaultRenderer; ???
static wxGraphicsRenderer* GetDefaultRenderer();
+#if 0
static wxGraphicsRenderer* GetCairoRenderer();
+#endif
%nokwargs CreateContext;
%newobject CreateContext;