%pragma(python) code = "import wx"
+//----------------------------------------------------------------------
+
%{
- static wxString wxPyEmptyStr("");
+ // Put some wx default wxChar* values into wxStrings.
+ DECLARE_DEF_STRING(PanelNameStr);
+ static const wxString wxPyEmptyString(wxT(""));
%}
//---------------------------------------------------------------------------
wxPyValidator* ptr = NULL;
wxPyValidator* self = (wxPyValidator*)this;
- wxPyTState* state = wxPyBeginBlockThreads();
+ wxPyBeginBlockThreads();
if (self->m_myInst.findCallback("Clone")) {
PyObject* ro;
ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
Py_DECREF(ro);
}
}
- wxPyEndBlockThreads(state);
+ wxPyEndBlockThreads();
// This is very dangerous!!! But is the only way I could find
// to squash a memory leak. Currently it is okay, but if the
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- char* name = "panel");
+ const wxString& name = wxPyPanelNameStr);
%name(wxPreWindow)wxWindow();
bool Create(wxWindow* parent, const wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
- char* name = "panel");
+ const wxString& name = wxPyPanelNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
%name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
void Fit();
wxColour GetBackgroundColour();
+ wxBorder GetBorder() const;
//wxList& GetChildren();
%addmethods {
int GetCharWidth();
%name(GetClientSizeTuple) void GetClientSize(int *OUTPUT, int *OUTPUT);
wxSize GetClientSize();
+
+ // get the origin of the client area of the window relative to the
+ // window top left corner (the client area may be shifted because of
+ // the borders, scrollbars, other decorations...)
+ wxPoint GetClientAreaOrigin() const;
+
+ // get the client rectangle in window (i.e. client) coordinates
+ wxRect GetClientRect() const;
+
wxLayoutConstraints * GetConstraints();
wxEvtHandler* GetEventHandler();
long GetWindowStyleFlag();
void SetWindowStyleFlag(long style);
void SetWindowStyle(long style);
+ bool HasScrollbar(int orient) const;
bool Hide();
+ wxHitTest HitTest(const wxPoint& pt);
void InitDialog();
bool IsEnabled();
bool IsExposed( int x, int y, int w=0, int h=0 );
bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
void Lower();
void MakeModal(bool flag=TRUE);
- %name(MoveXY)void Move(int x, int y);
- void Move(const wxPoint& point);
+ %name(MoveXY)void Move(int x, int y, int flags = wxSIZE_USE_EXISTING);
+ void Move(const wxPoint& point, int flags = wxSIZE_USE_EXISTING);
wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
void PushEventHandler(wxEvtHandler* handler);
+ // find the given handler in the event handler chain and remove (but
+ // not delete) it from the event handler chain, return TRUE if it was
+ // found and FALSE otherwise (this also results in an assert failure so
+ // this function should only be called when the handler is supposed to
+ // be there)
+ bool RemoveEventHandler(wxEvtHandler *handler);
+
%name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
bool PopupMenu(wxMenu *menu, const wxPoint& pos);
self->SetSize(size);
}
- void SetPosition(const wxPoint& pos) {
- self->Move(pos);
+ void SetPosition(const wxPoint& pos, int flags = wxSIZE_USE_EXISTING) {
+ self->Move(pos, flags);
}
void SetRect(const wxRect& rect, int sizeFlags=wxSIZE_AUTO) {
bool Show(bool show=TRUE);
bool TransferDataFromWindow();
bool TransferDataToWindow();
+ void UpdateWindowUI();
bool Validate();
void WarpPointer(int x, int y);
void SetToolTip(wxToolTip *tooltip);
wxToolTip* GetToolTip();
- void SetSizer(wxSizer* sizer);
+ void SetSizer(wxSizer* sizer, bool deleteOld=TRUE);
wxSizer* GetSizer();
+ // Track if this window is a member of a sizer
+ void SetContainingSizer(wxSizer* sizer);
+ wxSizer *GetContainingSizer() const;
+
wxValidator* GetValidator();
void SetValidator(const wxValidator& validator);
#endif
wxSize GetBestSize();
+ wxSize GetMaxSize();
void SetCaret(wxCaret *caret);
wxCaret *GetCaret();
wxString GetHelpText();
void SetHelpText(const wxString& helpText);
+ void SetHelpTextForId(const wxString& text);
bool ScrollLines(int lines);
bool ScrollPages(int pages);
void SetAcceleratorTable(const wxAcceleratorTable& accel);
wxAcceleratorTable *GetAcceleratorTable();
+#ifdef __WXMSW__
+ // A way to do the native draw first... Too bad it isn't in wxGTK too.
+ void OnPaint(wxPaintEvent& event);
+#endif
- %name(base_OnPaint)void OnPaint(wxPaintEvent& event);
+ wxWindow* GetDefaultItem();
+ wxWindow* SetDefaultItem(wxWindow *btn);
};
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
- const char* name = "panel");
+ const wxString& name = wxPyPanelNameStr);
%name(wxPrePanel)wxPanel();
bool Create(wxWindow* parent,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
- const char* name = "panel");
+ const wxString& name = wxPyPanelNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
void InitDialog();
- wxButton* GetDefaultItem();
- void SetDefaultItem(wxButton *btn);
};
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxHSCROLL | wxVSCROLL,
- char* name = "scrolledWindow");
+ const wxString& name = wxPyPanelNameStr);
%name(wxPreScrolledWindow)wxScrolledWindow();
bool Create(wxWindow* parent,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxHSCROLL | wxVSCROLL,
- char* name = "scrolledWindow");
+ const wxString& name = wxPyPanelNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(val)"
void GetViewStart(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);
+ %name(CalcScrolledPosition1)wxPoint CalcScrolledPosition(const wxPoint& pt);
+ %name(CalcScrolledPosition2)void CalcScrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+
+ %name(CalcUnscrolledPosition1)wxPoint CalcUnscrolledPosition(const wxPoint& pt);
+ %name(CalcUnscrolledPosition2)void CalcUnscrolledPosition( int x, int y, int *OUTPUT, int *OUTPUT);
+
+ %pragma(python) addtoclass = "
+ def CalcScrolledPosition(self, *args):
+ if len(args) == 1:
+ return apply(self.CalcScrolledPosition1, args)
+ elif len(args) == 2:
+ return apply(self.CalcScrolledPosition2, args)
+ else:
+ raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
+
+ def CalcUnscrolledPosition(self, *args):
+ if len(args) == 1:
+ return apply(self.CalcUnscrolledPosition1, args)
+ elif len(args) == 2:
+ return apply(self.CalcUnscrolledPosition2, args)
+ else:
+ raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
+"
void SetScale(double xs, double ys);
double GetScaleX();
double GetScaleY();
void AdjustScrollbars();
+
+ bool Layout();
};
//----------------------------------------------------------------------
class wxMenu : public wxEvtHandler {
public:
- wxMenu(const wxString& title = wxPyEmptyStr, long style = 0);
+ wxMenu(const wxString& title = wxPyEmptyString, long style = 0);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
void Append(int id, const wxString& item,
- const wxString& helpString = wxPyEmptyStr,
- int checkable = FALSE);
+ const wxString& helpString = wxPyEmptyString,
+ wxItemKind kind = wxITEM_NORMAL);
%name(AppendMenu)void Append(int id, const wxString& item, wxMenu *subMenu,
- const wxString& helpString = wxPyEmptyStr);
+ const wxString& helpString = wxPyEmptyString);
%name(AppendItem)void Append(const wxMenuItem* item);
-
+ void AppendCheckItem(int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
+ void AppendRadioItem(int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
void AppendSeparator();
+
+
+ void Insert(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString,
+ wxItemKind kind = wxITEM_NORMAL);
+ void InsertSeparator(size_t pos);
+ void InsertCheckItem(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
+ void InsertRadioItem(size_t pos,
+ int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
+ %name(InsertMenu)void Insert(size_t pos,
+ int id,
+ const wxString& text,
+ wxMenu *submenu,
+ const wxString& help = wxPyEmptyString);
+ %name(InsertItem)bool Insert(size_t pos, wxMenuItem *item);
+
+
+ void Prepend(int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString,
+ wxItemKind kind = wxITEM_NORMAL);
+ void PrependSeparator();
+ void PrependCheckItem(int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
+ void PrependRadioItem(int id,
+ const wxString& text,
+ const wxString& help = wxPyEmptyString);
+ %name(PrependMenu)void Prepend(int id,
+ const wxString& text,
+ wxMenu *submenu,
+ const wxString& help = wxPyEmptyString);
+ %name(PrependItem)void Prepend(wxMenuItem *item);
+
+
void Break();
void Check(int id, bool flag);
bool IsChecked(int id);
bool Delete(int id);
%name(DeleteItem)bool Delete(wxMenuItem *item);
- bool Insert(size_t pos, wxMenuItem *item);
wxMenuItem *Remove(int id);
%name(RemoveItem) wxMenuItem *Remove(wxMenuItem *item);
+
+
+
%addmethods {
void Destroy() { delete self; }
}
class wxMenuItem : public wxObject {
public:
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_SEPARATOR,
- const wxString& text = wxPyEmptyStr,
- const wxString& help = wxPyEmptyStr,
- bool isCheckable = FALSE, wxMenu* subMenu = NULL);
+ const wxString& text = wxPyEmptyString,
+ const wxString& help = wxPyEmptyString,
+ wxItemKind kind = wxITEM_NORMAL,
+ wxMenu* subMenu = NULL);
wxMenu *GetMenu();
void SetText(const wxString& str);
wxString GetLabel();
const wxString& GetText();
+ wxItemKind GetKind();
void SetCheckable(bool checkable);
bool IsCheckable();
bool IsSubMenu();
void SetAccel(wxAcceleratorEntry *accel);
static wxString GetLabelFromText(const wxString& text);
+// static wxAcceleratorEntry *GetAccelFromString(const wxString& label);
// wxOwnerDrawn methods
#ifdef __WXMSW__
projects / wxWidgets.git / blobdiff