%{
#include "helpers.h"
-
-#ifdef __WXMSW__
- // wxGTK defines wxMenuItem inside menu.h
#include <wx/menuitem.h>
-#endif
-
-#ifdef __WXMSW__
-#include <wx/minifram.h>
-#endif
%}
//----------------------------------------------------------------------
%import misc.i
%import gdi.i
-%pragma(python) code = "import wxp"
+
+%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
class wxEvtHandler {
public:
+ bool ProcessEvent(wxEvent& event);
+ //bool SearchEventTable(wxEventTable& table, wxEvent& event);
+
+ bool GetEvtHandlerEnabled();
+ void SetEvtHandlerEnabled(bool enabled);
+
+ wxEvtHandler* GetNextHandler();
+ wxEvtHandler* GetPreviousHandler();
+ void SetNextHandler(wxEvtHandler* handler);
+ void SetPreviousHandler(wxEvtHandler* handler);
+
+
%addmethods {
void Connect( int id, int lastId, int eventType, PyObject* func) {
if (PyCallable_Check(func)) {
//----------------------------------------------------------------------
+class wxValidator : public wxEvtHandler {
+public:
+ wxValidator();
+ //~wxValidator();
+
+ wxValidator* Clone();
+ wxWindow* GetWindow();
+ void SetWindow(wxWindow* window);
+};
+
+%inline %{
+ bool wxValidator_IsSilent() {
+ return wxValidator::IsSilent();
+ }
+
+ void wxValidator_SetBellOnError(int doIt = TRUE) {
+ wxValidator::SetBellOnError(doIt);
+ }
+%}
+
+//----------------------------------------------------------------------
+%{
+class wxPyValidator : public wxValidator {
+ DECLARE_DYNAMIC_CLASS(wxPyValidator);
+public:
+ wxPyValidator() {
+ }
+// wxPyValidator(const wxPyValidator& other);
+
+ ~wxPyValidator() {
+ }
+
+ wxObject* wxPyValidator::Clone() const {
+ wxPyValidator* ptr = NULL;
+ wxPyValidator* self = (wxPyValidator*)this;
+
+ bool doSave = wxPyRestoreThread();
+ if (self->m_myInst.findCallback("Clone")) {
+ PyObject* ro;
+ ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
+ SWIG_GetPtrObj(ro, (void **)&ptr, "_wxPyValidator_p");
+ }
+ // This is very dangerous!!! But is the only way I could find
+ // to squash a memory leak. Currently it is okay, but if the
+ // validator architecture in wxWindows ever changes, problems
+ // could arise.
+ delete self;
+
+ wxPySaveThread(doSave);
+ 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);
+IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferToWindow);
+IMP_PYCALLBACK_BOOL_(wxPyValidator, wxValidator, TransferFromWindow);
+
+IMPLEMENT_DYNAMIC_CLASS(wxPyValidator, wxValidator);
+
+%}
+
+class wxPyValidator : public wxValidator {
+public:
+ wxPyValidator();
+// ~wxPyValidator();
+
+ %addmethods {
+ void Destroy() { delete self; }
+ }
+
+ void _setSelf(PyObject* self, int incref=TRUE);
+ %pragma(python) addtomethod = "__init__:self._setSelf(self, 0)"
+
+};
+
+//----------------------------------------------------------------------
+
+%apply int * INOUT { int* x, int* y };
class wxWindow : public wxEvtHandler {
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);
- void Centre(int direction = wxHORIZONTAL);
- void ClientToScreen(int *BOTH, int *BOTH);
+ void Center(int direction = wxBOTH);
+ void Centre(int direction = wxBOTH);
+ void CentreOnParent(int direction = wxBOTH );
+ void CenterOnParent(int direction = wxBOTH );
+
+ // (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();
#endif
void Enable(bool enable);
//bool FakePopupMenu(wxMenu* menu, int x, int y);
- %name(FindWindowByID) wxWindow* FindWindow(long id);
+ %name(FindWindowById) wxWindow* FindWindow(long id);
%name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
void Fit();
wxColour GetBackgroundColour();
+
+ //wxList& GetChildren();
+ %addmethods {
+ PyObject* GetChildren() {
+ wxWindowList& list = self->GetChildren();
+ return wxPy_ConvertList(&list, "wxWindow");
+ }
+ }
+
+
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();
+ wxEvtHandler* GetEventHandler();
+
+ wxFont& GetFont();
wxColour GetForegroundColour();
wxWindow * GetGrandParent();
int GetId();
- void GetPosition(int *OUTPUT, int *OUTPUT);
wxString GetLabel();
+ void SetLabel(const wxString& label);
wxString GetName();
wxWindow * GetParent();
- int GetReturnCode();
+ %name(GetPositionTuple) void GetPosition(int *OUTPUT, int *OUTPUT);
+ wxPoint GetPosition();
+ wxRect GetRect();
int GetScrollThumb(int orientation);
int GetScrollPos(int orientation);
int GetScrollRange(int orientation);
- void GetSize(int *OUTPUT, int *OUTPUT);
- void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT); // int* descent = NULL, int* externalLeading = NULL, const wxFont* font = NULL, bool use16 = FALSE)
+ %name(GetSizeTuple) void GetSize(int *OUTPUT, int *OUTPUT);
+ wxSize GetSize();
+ void GetTextExtent(const wxString& string, int *OUTPUT, int *OUTPUT);
+ %name(GetFullTextExtent)void GetTextExtent(const wxString& string,
+ int *OUTPUT, int *OUTPUT, int *OUTPUT, int* OUTPUT,
+ const wxFont* font = NULL); //, bool use16 = FALSE)
wxString GetTitle();
+ wxRegion GetUpdateRegion();
long GetWindowStyleFlag();
+ bool Hide();
void InitDialog();
bool IsEnabled();
bool IsRetained();
bool IsShown();
+ bool IsTopLevel();
void Layout();
bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
void Lower();
void MakeModal(bool flag);
- void Move(int x, int y);
+ %name(MoveXY)void Move(int x, int y);
+ void Move(const wxPoint& point);
+
+ wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
+ void PushEventHandler(wxEvtHandler* handler);
- //wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
- bool PopupMenu(wxMenu *menu, int x, int y);
- //void PushEventHandler(wxEvtHandler* handler);
+ %name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
+ bool PopupMenu(wxMenu *menu, const wxPoint& pos);
void Raise();
void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
void ReleaseMouse();
- void ScreenToClient(int *BOTH, int *BOTH);
+ bool Reparent( wxWindow* newParent );
+
+ // (uses apply'ed INOUT typemap, see above)
+ %name(ScreenToClientXY)void ScreenToClient(int *x, int *y);
+ wxPoint ScreenToClient(const wxPoint& pt);
+
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);
- void SetDoubleClick(bool allowDoubleClick);
+ void UnsetConstraints(wxLayoutConstraints *constraints);
void SetFocus();
+ bool AcceptsFocus();
void SetFont(const wxFont& font);
void SetForegroundColour(const wxColour& colour);
void SetId(int id);
void SetName(const wxString& name);
- void SetReturnCode(int retCode);
void SetScrollbar(int orientation, int position, int thumbSize, int range, bool refresh = TRUE);
void SetScrollPos(int orientation, int pos, bool refresh = TRUE);
- //void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
- //%name(SetSizeOnly) void SetSize(int width, int height);
-
%name(SetDimensions) void SetSize(int x, int y, int width, int height, int sizeFlags=wxSIZE_AUTO);
%addmethods {
void SetSize(const wxSize& size) {
}
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);
+ %name(SetClientSizeWH)void SetClientSize(int width, int height);
+ void SetClientSize(const wxSize& size);
//void SetPalette(wxPalette* palette);
- //void SetColourMap(wxColourMap *colourMap);
void SetCursor(const wxCursor&cursor);
- //void SetEventHandler(wxEvtHandler* handler);
+ void SetEventHandler(wxEvtHandler* handler);
void SetTitle(const wxString& title);
bool Show(bool show);
bool TransferDataFromWindow();
bool TransferDataToWindow();
bool Validate();
-#ifdef __WXMSW__
void WarpPointer(int x, int y);
-#endif
+
+ %name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
+ %name(ConvertDialogSizeToPixels) wxSize ConvertDialogToPixels(const wxSize& sz);
+
+ %name(DLG_PNT) wxPoint ConvertDialogToPixels(const wxPoint& pt);
+ %name(DLG_SZE) wxSize ConvertDialogToPixels(const wxSize& sz);
+
+ %name(ConvertPixelPointToDialog) wxPoint ConvertPixelsToDialog(const wxPoint& pt);
+ %name(ConvertPixelSizeToDialog) wxSize ConvertPixelsToDialog(const wxSize& sz);
+
+ %name(SetToolTipString)void SetToolTip(const wxString &tip);
+ void SetToolTip(wxToolTip *tooltip);
+ wxToolTip* GetToolTip();
+
+ void SetSizer(wxSizer* sizer);
+ wxValidator* GetValidator();
+ void SetValidator(const wxValidator& validator);
};
+//%clear int* x, int* y;
+
+
+
+%pragma(python) code = "
+def wxDLG_PNT(win, point_or_x, y=None):
+ if y is None:
+ return win.ConvertDialogPointToPixels(point_or_x)
+ else:
+ return win.ConvertDialogPointToPixels(wxPoint(point_or_x, y))
+
+def wxDLG_SZE(win, size_width, height=None):
+ if height is None:
+ return win.ConvertDialogSizeToPixels(size_width)
+ else:
+ return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
+"
-// Static method(s)
#ifdef __WXMSW__
%inline %{
wxWindow* wxWindow_FindFocus() {
return wxWindow::FindFocus();
}
%}
+
+
+%inline %{
+wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
+ wxWindow* win = new wxWindow;
+ win->SetHWND(hWnd);
+ win->SubclassWin(hWnd);
+ return win;
+}
+%}
#endif
+
//---------------------------------------------------------------------------
class wxPanel : public wxWindow {
long style = wxTAB_TRAVERSAL,
const char* name = "panel");
- %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void InitDialog();
+ 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
+"
};
//---------------------------------------------------------------------------
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);
void SetTitle(const wxString& title);
bool Show(bool show);
int ShowModal();
+
+ int GetReturnCode();
+ void SetReturnCode(int retCode);
};
//---------------------------------------------------------------------------
-class wxScrolledWindow : public wxWindow {
+class wxScrolledWindow : public wxPanel {
public:
wxScrolledWindow(wxWindow* parent,
const wxWindowID id = -1,
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);
class wxMenu : public wxEvtHandler {
public:
- wxMenu(const wxString& title = wxPyEmptyStr);
+ wxMenu(const wxString& title = wxPyEmptyStr, long style = 0);
void Append(int id, const wxString& item,
const wxString& helpString = wxPyEmptyStr,
int checkable = FALSE);
%name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
const wxString& helpString = wxPyEmptyStr);
+ %name(AppendItem)void Append(const wxMenuItem* item);
+
void AppendSeparator();
void Break();
void Check(int id, bool flag);
void Enable(int id, bool enable);
int FindItem(const wxString& itemString);
-#ifdef __WXMSW__
wxString GetTitle();
void SetTitle(const wxString& title);
-#endif
wxMenuItem* FindItemForId(int id);
wxString GetHelpString(int id);
wxString GetLabel(int id);
bool IsChecked(int id);
bool IsEnabled(int id);
void SetLabel(int id, const wxString& label);
+ void UpdateUI(wxEvtHandler* source = NULL);
+
+ %addmethods {
+ void Destroy() {
+ delete self;
+ }
+ }
+
};
// be used for PopupMenus, but you must retain a referece to it while using
// it.
//
-class wxPyMenu : public wxMenu {
-public:
- wxPyMenu(const wxString& title = wxPyEmptyStr, PyObject* func = NULL);
- ~wxPyMenu();
-};
+// class wxPyMenu : public wxMenu {
+// public:
+// wxPyMenu(const wxString& title = wxPyEmptyStr, PyObject* func = NULL);
+// ~wxPyMenu();
+// };
//----------------------------------------------------------------------
void Enable(int id, bool enable);
bool Enabled(int id);
int FindMenuItem(const wxString& menuString, const wxString& itemString);
-#ifdef __WXGTK__
- %name(FindItemForId) wxMenuItem* FindMenuItemById( int id );
-#endif
-#ifdef __WXMSW__
wxMenuItem * FindItemForId(int id);
+ void SetLabel(int id, const wxString& label);
void EnableTop(int pos, bool enable);
wxString GetHelpString(int id);
wxString GetLabel(int id);
void SetHelpString(int id, const wxString& helpString);
- void SetLabel(int id, const wxString& label);
wxString GetLabelTop(int pos);
void SetLabelTop(int pos, const wxString& label);
-#endif
int GetMenuCount();
wxMenu* GetMenu(int i);
+ void Refresh();
};
class wxMenuItem {
public:
+#ifndef __WXGTK__
+ wxMenuItem(wxMenu* parentMenu=NULL, int id=ID_SEPARATOR,
+ const wxString& text = wxPyEmptyStr,
+ const wxString& helpString = wxPyEmptyStr,
+ bool checkable = FALSE, wxMenu* subMenu = NULL);
+#else
+ wxMenuItem();
+#endif
+
bool IsSeparator();
bool IsEnabled();
bool IsChecked();
bool IsCheckable();
int GetId();
wxMenu* GetSubMenu();
-#ifdef __WXMSW__
void SetName(const wxString& strName);
- void DeleteSubMenu();
- const wxString& GetName();
-#endif
- const wxString& GetHelp();
+ wxString GetName();
+ wxString GetHelp();
void SetHelp(const wxString& strHelp);
void Enable(bool bDoEnable = TRUE);
void Check(bool bDoCheck = TRUE);
+
+#ifdef __WXMSW__
+ wxColour& GetBackgroundColour();
+ wxBitmap GetBitmap(bool checked = TRUE);
+ wxFont& GetFont();
+ int GetMarginWidth();
+ wxColour& GetTextColour();
+ void SetBackgroundColour(const wxColour& colour);
+ void SetBitmaps(const wxBitmap& checked, const wxBitmap& unchecked = wxNullBitmap);
+ void SetFont(const wxFont& font);
+ void SetMarginWidth(int width);
+ void SetTextColour(const wxColour& colour);
+ void DeleteSubMenu();
+#endif
};
//---------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// 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
-// Removed an extra method definition
-//
-// Revision 1.4 1998/08/16 04:31:11 RD
-// More wxGTK work.
-//
-// Revision 1.3 1998/08/15 07:36:47 RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files. It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.2 1998/08/14 23:36:46 RD
-// Beginings of wxGTK compatibility
-//
-// Revision 1.1 1998/08/09 08:25:52 RD
-// Initial version
-//
-//
projects / wxWidgets.git / blobdiff