%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(""));
%}
//---------------------------------------------------------------------------
(wxObjectEventFunction) &wxPyCallback::EventThunker,
new wxPyCallback(func));
}
+ else if (func == Py_None) {
+ self->Disconnect(id, lastId, eventType,
+ (wxObjectEventFunction)
+ &wxPyCallback::EventThunker);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, "Expected callable object or None.");
+ }
}
bool Disconnect(int id, int lastId = -1,
}
}
-// %pragma(python) addtoclass = "
-// _prop_list_ = {}
-// "
-// %pragma(python) addtoclass = "
-// def __getattr__(self, name):
-// pl = self._prop_list_
-// if pl.has_key(name):
-// getFunc, setFunc = pl[name]
-// if getFunc:
-// return getattr(self, getFunc)()
-// else:
-// raise TypeError, '%s property is write-only' % name
-// raise AttributeError, name
-
-// def __setattr__(self, name, value):
-// pl = self._prop_list_
-// if pl.has_key(name):
-// getFunc, setFunc = pl[name]
-// if setFunc:
-// return getattr(self, setFunc)(value)
-// else:
-// raise TypeError, '%s property is read-only' % name
-// self.__dict__[name] = value
-// "
+ %addmethods {
+ void _setOORInfo(PyObject* _self) {
+ self->SetClientObject(new wxPyOORClientData(_self));
+ }
+ }
};
wxValidator();
//~wxValidator();
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
wxValidator* Clone();
wxWindow* GetWindow();
void SetWindow(wxWindow* window);
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_)
-// "
};
~wxPyValidator() {
}
- wxObject* wxPyValidator::Clone() const {
+ wxObject* Clone() const {
wxPyValidator* ptr = NULL;
wxPyValidator* self = (wxPyValidator*)this;
- bool doSave = wxPyRestoreThread();
+ wxPyBeginBlockThreads();
if (self->m_myInst.findCallback("Clone")) {
PyObject* ro;
ro = self->m_myInst.callCallbackObj(Py_BuildValue("()"));
Py_DECREF(ro);
}
}
+ 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
// validator architecture in wxWindows ever changes, problems
// could arise.
delete self;
-
- wxPySaveThread(doSave);
return ptr;
}
public:
wxPyValidator();
- void _setSelf(PyObject* self, PyObject* _class, int incref=TRUE);
- %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyValidator, 1)"
+ void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=TRUE);
+ %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPyValidator, 1)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
};
//----------------------------------------------------------------------
class wxWindow : public wxEvtHandler {
public:
-
wxWindow(wxWindow* parent, const wxWindowID id,
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,
+ const wxString& name = wxPyPanelNameStr);
+
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPreWindow:val._setOORInfo(val)"
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
- void CaptureMouse();
void Center(int direction = wxBOTH);
void Centre(int direction = wxBOTH);
void CentreOnParent(int direction = wxBOTH );
void DragAcceptFiles(bool accept);
#endif
void Enable(bool enable);
- //bool FakePopupMenu(wxMenu* menu, int x, int y);
+ void Disable();
+
+ // Find child window by ID or name
%name(FindWindowById) wxWindow* FindWindow(long id);
%name(FindWindowByName) wxWindow* FindWindow(const wxString& name);
+
void Fit();
+
+ // set virtual size to satisfy children
+ void FitInside();
+
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();
- wxFont& GetFont();
+ wxFont GetFont();
wxColour GetForegroundColour();
wxWindow * GetGrandParent();
%addmethods {
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 IsShown();
bool IsTopLevel();
void Layout();
+#ifdef wxUSE_WX_RESOURCES
bool LoadFromResource(wxWindow* parent, const wxString& resourceName, const wxResourceTable* resourceTable = NULL);
+#endif
void Lower();
- void MakeModal(bool flag);
- %name(MoveXY)void Move(int x, int y);
- void Move(const wxPoint& point);
+ void MakeModal(bool flag=TRUE);
+ %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);
void Raise();
void Refresh(bool eraseBackground = TRUE, const wxRect* rect = NULL);
- void ReleaseMouse();
+ void RefreshRect(const wxRect& rect);
+
+ void AddChild(wxWindow* child);
void RemoveChild(wxWindow* child);
bool Reparent( wxWindow* newParent );
wxPoint ScreenToClient(const wxPoint& pt);
void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
- void SetAcceleratorTable(const wxAcceleratorTable& accel);
void SetAutoLayout(bool autoLayout);
bool GetAutoLayout();
void SetBackgroundColour(const wxColour& colour);
void SetConstraints(wxLayoutConstraints *constraints);
void UnsetConstraints(wxLayoutConstraints *constraints);
void SetFocus();
+ void SetFocusFromKbd();
bool AcceptsFocus();
void SetFont(const wxFont& font);
void SetForegroundColour(const wxColour& colour);
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) {
}
}
- void SetSizeHints(int minW=-1, int minH=-1, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1);
+ void SetSizeHints(int minW, int minH,
+ int maxW=-1, int maxH=-1,
+ int incW=-1, int incH=-1);
+ void SetVirtualSizeHints( int minW, int minH,
+ int maxW = -1, int maxH = -1 );
+
+ void SetVirtualSize( const wxSize &size );
+ %name(SetVirtualSizeWH)void SetVirtualSize( int x, int y );
+
+ wxSize GetVirtualSize() const;
+ %name(GetVirtualSizeTuple)void GetVirtualSize( int *OUTPUT, int *OUTPUT ) const;
+
+ wxSize GetBestVirtualSize();
+
%name(SetClientSizeWH)void SetClientSize(int width, int height);
void SetClientSize(const wxSize& size);
//void SetPalette(wxPalette* palette);
- void SetCursor(const wxCursor&cursor);
+ bool SetCursor(const wxCursor& cursor);
+ wxCursor& GetCursor();
void SetEventHandler(wxEvtHandler* handler);
void SetExtraStyle(long exStyle);
void SetTitle(const wxString& title);
- bool Show(bool show);
+ bool Show(bool show=TRUE);
bool TransferDataFromWindow();
bool TransferDataToWindow();
+ void UpdateWindowUI();
bool Validate();
- void WarpPointer(int x, int y);
%name(ConvertDialogPointToPixels) wxPoint ConvertDialogToPixels(const wxPoint& pt);
%name(ConvertDialogSizeToPixels) wxSize ConvertDialogToPixels(const wxSize& sz);
void SetToolTip(wxToolTip *tooltip);
wxToolTip* GetToolTip();
- void SetSizer(wxSizer* sizer);
+ void SetSizer(wxSizer* sizer, bool deleteOld=TRUE);
+ void SetSizerAndFit(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);
%pragma(python) addtomethod = "SetDropTarget:_args[0].thisown = 0"
wxSize GetBestSize();
+ wxSize GetMaxSize();
+
+ // There are times (and windows) where 'Best' size and 'Min' size
+ // are vastly out of sync. This should be remedied somehow, but in
+ // the meantime, this method will return the larger of BestSize
+ // (the window's smallest legible size), and any user specified
+ // MinSize hint.
+ wxSize GetAdjustedBestSize();
void SetCaret(wxCaret *caret);
wxCaret *GetCaret();
%pragma(python) addtoclass = "# replaces broken shadow method
def GetCaret(self, *_args, **_kwargs):
from misc2 import wxCaretPtr
- val = apply(windowsc.wxWindow_GetCaret,(self,) + _args, _kwargs)
+ val = windowsc.wxWindow_GetCaret(self, *_args, **_kwargs)
if val: val = wxCaretPtr(val)
return val
"
void Freeze();
void Thaw();
+ void Update();
wxString GetHelpText();
void SetHelpText(const wxString& helpText);
+ void SetHelpTextForId(const wxString& text);
+
+ bool ScrollLines(int lines);
+ bool ScrollPages(int pages);
+ bool LineUp();
+ bool LineDown();
+ bool PageUp();
+ bool PageDown();
+
+ static wxWindow* FindFocus();
+ static int NewControlId();
+ static int NextControlId(int id);
+ static int PrevControlId(int id);
+
+ 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
+
+ wxWindow* GetDefaultItem();
+ wxWindow* SetDefaultItem(wxWindow *btn);
+ void SetTmpDefaultItem(wxWindow *win);
+
+ // move the mouse to the specified position
+ void WarpPointer(int x, int y);
+
+ // start or end mouse capture, these functions maintain the stack of
+ // windows having captured the mouse and after calling ReleaseMouse()
+ // the mouse is not released but returns to the window which had had
+ // captured it previously (if any)
+ void CaptureMouse();
+ void ReleaseMouse();
+ // get the window which currently captures the mouse or NULL
+ static wxWindow *GetCapture();
-// // 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_)
-// "
+ // does this window have the capture?
+ bool HasCapture() const;
+
+ void SetThemeEnabled(bool enable);
+ bool GetThemeEnabled();
};
return win.ConvertDialogSizeToPixels(wxSize(size_width, height))
"
-%inline %{
- wxWindow* wxWindow_FindFocus() {
- return wxWindow::FindFocus();
- }
-%}
-
#ifdef __WXMSW__
%inline %{
%}
#endif
+
+// Unfortunatly the names of these new static methods clash with the
+// names wxPython has been using forever for the overloaded
+// wxWindow::FindWindow, so instead of swigging them as statics create
+// standalone functions for them.
%inline %{
- int wxWindow_NewControlId() {
- return wxWindow::NewControlId();
- }
- int wxWindow_NextControlId(int id) {
- return wxWindow::NextControlId(id);
- }
- int wxWindow_PrevControlId(int id) {
- return wxWindow::PrevControlId(id);
- }
+wxWindow* wxFindWindowById( long id, const wxWindow *parent = NULL ) {
+ return wxWindow::FindWindowById(id, parent);
+}
+
+wxWindow* wxFindWindowByName( const wxString& name,
+ const wxWindow *parent = NULL ) {
+ return wxWindow::FindWindowByName(name, parent);
+}
+
+wxWindow* wxFindWindowByLabel( const wxString& label,
+ const wxWindow *parent = NULL ) {
+ return wxWindow::FindWindowByLabel(label, parent);
+}
%}
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxTAB_TRAVERSAL,
- const char* name = "panel");
-
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
+ const wxString& name = wxPyPanelNameStr);
+ %name(wxPrePanel)wxPanel();
- void InitDialog();
- wxButton* GetDefaultItem();
- void SetDefaultItem(wxButton *btn);
-
-};
+ bool Create(wxWindow* parent,
+ const wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTAB_TRAVERSAL,
+ const wxString& name = wxPyPanelNameStr);
-//---------------------------------------------------------------------------
-
-class wxDialog : public wxPanel {
-public:
- wxDialog(wxWindow* parent,
- const wxWindowID id,
- const wxString& title,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxDEFAULT_DIALOG_STYLE,
- const char* name = "dialogBox");
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPrePanel:val._setOORInfo(val)"
- %pragma(python) addtomethod = "__init__:#wx._StdDialogCallbacks(self)"
-
- void Centre(int direction = wxBOTH);
- void EndModal(int retCode);
- wxString GetTitle();
- void Iconize(bool iconize);
- bool IsIconized();
- void SetModal(bool flag);
- bool IsModal();
- void SetTitle(const wxString& title);
- bool Show(bool show);
- int ShowModal();
-
- int GetReturnCode();
- void SetReturnCode(int retCode);
-
- wxSizer* CreateTextSizer( const wxString &message );
- wxSizer* CreateButtonSizer( long flags );
+ void InitDialog();
};
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 wxWindowID id = -1,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxHSCROLL | wxVSCROLL,
+ const wxString& name = wxPyPanelNameStr);
- %pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
- %pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+ %pragma(python) addtomethod = "wxPreScrolledWindow:val._setOORInfo(val)"
void EnableScrolling(bool xScrolling, bool yScrolling);
int GetScrollPageSize(int orient);
void GetScrollPixelsPerUnit(int* OUTPUT, int* OUTPUT);
wxWindow* GetTargetWindow();
- void GetVirtualSize(int* OUTPUT, int* OUTPUT);
bool IsRetained();
void PrepareDC(wxDC& dc);
void Scroll(int x, int y);
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 self.CalcScrolledPosition1(*args)
+ elif len(args) == 2:
+ return self.CalcScrolledPosition2(*args)
+ else:
+ raise TypeError, 'Invalid parameters: only (x,y) or (point) allowed'
+
+ def CalcUnscrolledPosition(self, *args):
+ if len(args) == 1:
+ return self.CalcUnscrolledPosition1(*args)
+ elif len(args) == 2:
+ return 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();
+
+ // Set the x, y scrolling increments.
+ void SetScrollRate( int xstep, int ystep );
+
};
//----------------------------------------------------------------------
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; }
}
public:
wxMenuBar(long style = 0);
+ %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
+
bool Append(wxMenu *menu, const wxString& title);
bool Insert(size_t pos, wxMenu *menu, const wxString& title);
size_t GetMenuCount();
wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
wxMenu *Remove(size_t pos);
void EnableTop(size_t pos, bool enable);
+ bool IsEnabledTop(size_t pos);
void SetLabelTop(size_t pos, const wxString& label);
wxString GetLabelTop(size_t pos);
int FindMenu(const wxString& title);
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 SetMenu(wxMenu* menu);
void SetId(int id);
int GetId();
bool IsSeparator();
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__
void SetFont(const wxFont& font);
- wxFont& GetFont();
+ 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 SetBitmap(const wxBitmap& bmpChecked);
+ //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
+
+ void SetBitmap(const wxBitmap& bitmap);
+ const wxBitmap& GetBitmap();
+
};
//---------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff