%{
#include "helpers.h"
#include <wx/menuitem.h>
+#include <wx/tooltip.h>
%}
//----------------------------------------------------------------------
//---------------------------------------------------------------------------
-class wxEvtHandler {
+class wxEvtHandler : public wxObject {
public:
wxEvtHandler();
(wxObjectEventFunction)
&wxPyCallback::EventThunker);
}
-
- // This really belongs in the wxObject base class. It's probably
- // time to actually add it...
- const char* GetClassName() {
- return self->GetClassInfo()->GetClassName();
- }
}
// %pragma(python) addtoclass = "
wxWindow* GetWindow();
void SetWindow(wxWindow* window);
+ static bool IsSilent();
+ static void SetBellOnError(int doIt = TRUE);
+
// // Properties list
// %pragma(python) addtoclass = "
// _prop_list_ = {
// "
};
-%inline %{
- bool wxValidator_IsSilent() {
- return wxValidator::IsSilent();
- }
-
- void wxValidator_SetBellOnError(int doIt = TRUE) {
- wxValidator::SetBellOnError(doIt);
- }
-%}
//----------------------------------------------------------------------
%{
public:
wxPyValidator() {
}
-// wxPyValidator(const wxPyValidator& other);
~wxPyValidator() {
}
return ptr;
}
+
DEC_PYCALLBACK_BOOL_WXWIN(Validate);
DEC_PYCALLBACK_BOOL_(TransferToWindow);
DEC_PYCALLBACK_BOOL_(TransferFromWindow);
PYPRIVATE;
-// PyObject* m_data;
};
IMP_PYCALLBACK_BOOL_WXWIN(wxPyValidator, wxValidator, Validate);
class wxPyValidator : public wxValidator {
public:
wxPyValidator();
-// ~wxPyValidator();
-
- %addmethods { void Destroy() { delete self; } }
void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
- %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 0)"
+ %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 1)"
};
void CentreOnScreen(int direction = wxBOTH );
void CenterOnScreen(int direction = wxBOTH );
+ void Clear();
+
// (uses apply'ed INOUT typemap, see above)
%name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
wxPoint ClientToScreen(const wxPoint& pt);
bool Close(int force = FALSE);
bool Destroy();
void DestroyChildren();
+ bool IsBeingDeleted();
#ifdef __WXMSW__
void DragAcceptFiles(bool accept);
#endif
void SetCaret(wxCaret *caret);
wxCaret *GetCaret();
- %pragma(python) addtoclass = "# replaces broken shadow methods
+ %pragma(python) addtoclass = "# replaces broken shadow method
def GetCaret(self, *_args, **_kwargs):
from misc2 import wxCaretPtr
val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
if val: val = wxCaretPtr(val)
return val
-
- def GetSizer(self, *_args, **_kwargs):
- from sizers import wxSizerPtr
- val = apply(windowsc.wxWindow_GetSizer,(self,) + _args, _kwargs)
- if val: val = wxSizerPtr(val)
- return val
-
- def GetToolTip(self, *_args, **_kwargs):
- from misc2 import wxToolTipPtr
- val = apply(windowsc.wxWindow_GetToolTip,(self,) + _args, _kwargs)
- if val: val = wxToolTipPtr(val)
- return val
"
wxButton* GetDefaultItem();
void SetDefaultItem(wxButton *btn);
- // fix some SWIG trouble...
- %pragma(python) addtoclass = "
- def GetDefaultItem(self):
- import controls
- val = windowsc.wxPanel_GetDefaultItem(self.this)
- val = controls.wxButtonPtr(val)
- return val
-"
};
//---------------------------------------------------------------------------
wxSizer* CreateTextSizer( const wxString &message );
wxSizer* CreateButtonSizer( long flags );
- %pragma(python) addtoclass = "
- # replace swig generated shadow methods to resolve import issues
- def CreateTextSizer(self, *_args, **_kwargs):
- import sizers
- val = apply(windowsc.wxDialog_CreateTextSizer,(self,) + _args, _kwargs)
- if val: val = sizers.wxSizerPtr(val)
- return val
- def CreateButtonSizer(self, *_args, **_kwargs):
- import sizers
- val = apply(windowsc.wxDialog_CreateButtonSizer,(self,) + _args, _kwargs)
- if val: val = sizers.wxSizerPtr(val)
- return val
-"
-
};
//---------------------------------------------------------------------------
+
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+// derive from it and wxPanel.
+
+
class wxScrolledWindow : public wxPanel {
public:
wxScrolledWindow(wxWindow* parent,
void SetScrollPageSize(int orient, int pageSize);
void SetTargetWindow(wxWindow* window);
void GetViewStart(int* OUTPUT, int* OUTPUT);
- void ViewStart(int* OUTPUT, int* OUTPUT);
+ %pragma(python) addtoclass = "ViewStart = GetViewStart"
void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
//----------------------------------------------------------------------
-class wxMenuItem {
+class wxMenuItem : public wxObject {
public:
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
const wxString& text = wxPyEmptyStr,
void SetFont(const wxFont& font);
wxFont& GetFont();
void SetTextColour(const wxColour& colText);
- wxColour& GetTextColour();
+ wxColour GetTextColour();
void SetBackgroundColour(const wxColour& colBack);
- wxColour& GetBackgroundColour();
+ wxColour GetBackgroundColour();
void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap);
void SetBitmap(const wxBitmap& bmpChecked);