%{
#include "helpers.h"
#include <wx/menuitem.h>
+#include <wx/tooltip.h>
%}
//----------------------------------------------------------------------
%pragma(python) code = "import wx"
+
+%{
+ static wxString wxPyEmptyStr("");
+%}
+
//---------------------------------------------------------------------------
-class wxEvtHandler {
+class wxEvtHandler : public wxObject {
public:
+ wxEvtHandler();
+
bool ProcessEvent(wxEvent& event);
void AddPendingEvent(wxEvent& event);
//bool SearchEventTable(wxEventTable& table, wxEvent& event);
(wxObjectEventFunction)
&wxPyCallback::EventThunker);
}
-
}
- %pragma(python) addtoclass = "
- _prop_list_ = {}
- "
-
+// %pragma(python) addtoclass = "
+// _prop_list_ = {}
+// "
// %pragma(python) addtoclass = "
// def __getattr__(self, name):
// pl = self._prop_list_
wxWindow* GetWindow();
void SetWindow(wxWindow* window);
- // Properties list
- %pragma(python) addtoclass = "
- _prop_list_ = {
- 'window' : ('GetWindow', 'SetWindow'),
- }
- _prop_list_.update(wxEvtHandler._prop_list_)
- "
+ static bool IsSilent();
+ static void SetBellOnError(int doIt = TRUE);
+
+// // Properties list
+// %pragma(python) addtoclass = "
+// _prop_list_ = {
+// 'window' : ('GetWindow', 'SetWindow'),
+// }
+// _prop_list_.update(wxEvtHandler._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)"
};
public:
wxWindow(wxWindow* parent, const wxWindowID id,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
long style = 0,
char* name = "panel");
void Centre(int direction = wxBOTH);
void CentreOnParent(int direction = wxBOTH );
void CenterOnParent(int direction = wxBOTH );
+ 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);
bool Close(int force = FALSE);
bool Destroy();
void DestroyChildren();
+ bool IsBeingDeleted();
#ifdef __WXMSW__
void DragAcceptFiles(bool accept);
#endif
void SetPosition(const wxPoint& pos) {
self->Move(pos);
}
+
+ void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
+ self->SetSize(rect, sizeFlags);
+ }
}
void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
//void SetPalette(wxPalette* palette);
void SetCursor(const wxCursor&cursor);
void SetEventHandler(wxEvtHandler* handler);
+ void SetExtraStyle(long exStyle);
void SetTitle(const wxString& title);
bool Show(bool show);
bool TransferDataFromWindow();
"
- // Properties list
- %pragma(python) addtoclass = "
- _prop_list_ = {
- 'size' : ('GetSize', 'SetSize'),
- 'enabled' : ('IsEnabled', 'Enable'),
- 'background' : ('GetBackgroundColour', 'SetBackgroundColour'),
- 'foreground' : ('GetForegroundColour', 'SetForegroundColour'),
- 'children' : ('GetChildren', None),
- 'charHeight' : ('GetCharHeight', None),
- 'charWidth' : ('GetCharWidth', None),
- 'clientSize' : ('GetClientSize', 'SetClientSize'),
- 'font' : ('GetFont', 'SetFont'),
- 'grandParent' : ('GetGrandParent', None),
- 'handle' : ('GetHandle', None),
- 'label' : ('GetLabel', 'SetLabel'),
- 'name' : ('GetName', 'SetName'),
- 'parent' : ('GetParent', None),
- 'position' : ('GetPosition', 'SetPosition'),
- 'title' : ('GetTitle', 'SetTitle'),
- 'style' : ('GetWindowStyleFlag', 'SetWindowStyleFlag'),
- 'visible' : ('IsShown', 'Show'),
- 'toolTip' : ('GetToolTip', 'SetToolTip'),
- 'sizer' : ('GetSizer', 'SetSizer'),
- 'validator' : ('GetValidator', 'SetValidator'),
- 'dropTarget' : ('GetDropTarget', 'SetDropTarget'),
- 'caret' : ('GetCaret', 'SetCaret'),
- 'autoLayout' : ('GetAutoLayout', 'SetAutoLayout'),
- 'constraints' : ('GetConstraints', 'SetConstraints'),
-
- }
- _prop_list_.update(wxEvtHandler._prop_list_)
- "
+// // Properties list
+// %pragma(python) addtoclass = "
+// _prop_list_ = {
+// 'size' : ('GetSize', 'SetSize'),
+// 'enabled' : ('IsEnabled', 'Enable'),
+// 'background' : ('GetBackgroundColour', 'SetBackgroundColour'),
+// 'foreground' : ('GetForegroundColour', 'SetForegroundColour'),
+// 'children' : ('GetChildren', None),
+// 'charHeight' : ('GetCharHeight', None),
+// 'charWidth' : ('GetCharWidth', None),
+// 'clientSize' : ('GetClientSize', 'SetClientSize'),
+// 'font' : ('GetFont', 'SetFont'),
+// 'grandParent' : ('GetGrandParent', None),
+// 'handle' : ('GetHandle', None),
+// 'label' : ('GetLabel', 'SetLabel'),
+// 'name' : ('GetName', 'SetName'),
+// 'parent' : ('GetParent', None),
+// 'position' : ('GetPosition', 'SetPosition'),
+// 'title' : ('GetTitle', 'SetTitle'),
+// 'style' : ('GetWindowStyleFlag', 'SetWindowStyleFlag'),
+// 'visible' : ('IsShown', 'Show'),
+// 'toolTip' : ('GetToolTip', 'SetToolTip'),
+// 'sizer' : ('GetSizer', 'SetSizer'),
+// 'validator' : ('GetValidator', 'SetValidator'),
+// 'dropTarget' : ('GetDropTarget', 'SetDropTarget'),
+// 'caret' : ('GetCaret', 'SetCaret'),
+// 'autoLayout' : ('GetAutoLayout', 'SetAutoLayout'),
+// 'constraints' : ('GetConstraints', 'SetConstraints'),
+
+// }
+// _prop_list_.update(wxEvtHandler._prop_list_)
+// "
};
-//%clear int* x, int* y;
return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
"
-#ifdef __WXMSW__
%inline %{
wxWindow* wxWindow_FindFocus() {
return wxWindow::FindFocus();
%}
+#ifdef __WXMSW__
%inline %{
wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
wxWindow* win = new wxWindow;
public:
wxPanel(wxWindow* parent,
const wxWindowID id,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
const char* name = "panel");
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
-"
};
//---------------------------------------------------------------------------
wxDialog(wxWindow* parent,
const wxWindowID id,
const wxString& title,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_DIALOG_STYLE,
const char* name = "dialogBox");
int GetReturnCode();
void SetReturnCode(int retCode);
+
+ wxSizer* CreateTextSizer( const wxString &message );
+ wxSizer* CreateButtonSizer( long flags );
+
};
//---------------------------------------------------------------------------
+
+// TODO: Add wrappers for the wxScrollHelper class, make wxScrolledWindow
+// derive from it and wxPanel.
+
+
class wxScrolledWindow : public wxPanel {
public:
wxScrolledWindow(wxWindow* parent,
const wxWindowID id = -1,
- const wxPoint& pos = wxPyDefaultPosition,
- const wxSize& size = wxPyDefaultSize,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
long style = wxHSCROLL | wxVSCROLL,
char* name = "scrolledWindow");
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);
+ void SetScale(double xs, double ys);
+ double GetScaleX();
+ double GetScaleY();
+
+ void AdjustScrollbars();
};
//----------------------------------------------------------------------
class wxMenuBar : public wxWindow {
public:
- wxMenuBar();
+ wxMenuBar(long style = 0);
bool Append(wxMenu *menu, const wxString& title);
bool Insert(size_t pos, wxMenu *menu, const wxString& title);
//----------------------------------------------------------------------
-class wxMenuItem {
+class wxMenuItem : public wxObject {
public:
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
const wxString& text = wxPyEmptyStr,
wxAcceleratorEntry *GetAccel();
void SetAccel(wxAcceleratorEntry *accel);
+ static wxString GetLabelFromText(const wxString& text);
+
+ // wxOwnerDrawn methods
+#ifdef __WXMSW__
+ void SetFont(const wxFont& font);
+ wxFont& GetFont();
+ void SetTextColour(const wxColour& colText);
+ wxColour GetTextColour();
+ void SetBackgroundColour(const wxColour& colBack);
+ wxColour GetBackgroundColour();
+ void SetBitmaps(const wxBitmap& bmpChecked,
+ const wxBitmap& bmpUnchecked = wxNullBitmap);
+ void SetBitmap(const wxBitmap& bmpChecked);
+ const wxBitmap& GetBitmap(bool bChecked = TRUE);
+ void SetMarginWidth(int nWidth);
+ int GetMarginWidth();
+ static int GetDefaultMarginWidth();
+ //void SetName(const wxString& strName);
+ //const wxString& GetName();
+ //void SetCheckable(bool checkable);
+ //bool IsCheckable();
+ bool IsOwnerDrawn();
+ void ResetOwnerDrawn();
+#endif
};
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff