cleanup - reformatting

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-02-10 19:16:20 +00:00
parent 51941b4877
commit 5cf1cb1006

View File

@@ -122,13 +122,12 @@ public:
virtual wxString GetTitle() const; virtual wxString GetTitle() const;
// Set the shape of the window to the given region. // Set the shape of the window to the given region.
// Returns True if the platform supports this feature (and the operation // Returns True if the platform supports this feature
// is successful.) // (and the operation is successful.)
virtual bool SetShape(const wxRegion& region); virtual bool SetShape(const wxRegion& region);
// Attracts the users attention to this window if the application is inactive
// Attracts the users attention to this window if the application is // (should be called when a background event occurs)
// inactive (should be called when a background event occurs)
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
// Is this the active frame (highlighted in the taskbar)? // Is this the active frame (highlighted in the taskbar)?
@@ -138,7 +137,8 @@ public:
void MacSetMetalAppearance( bool on ); void MacSetMetalAppearance( bool on );
bool MacGetMetalAppearance() const; bool MacGetMetalAppearance() const;
#else #else
%extend { %extend
{
// TODO: Should they raise not implemented or just NOP??? // TODO: Should they raise not implemented or just NOP???
void MacSetMetalAppearance( bool on ) { /*wxPyRaiseNotImplemented();*/ } void MacSetMetalAppearance( bool on ) { /*wxPyRaiseNotImplemented();*/ }
bool MacGetMetalAppearance() const { /*wxPyRaiseNotImplemented();*/ return false; } bool MacGetMetalAppearance() const { /*wxPyRaiseNotImplemented();*/ return false; }
@@ -164,13 +164,15 @@ public:
MustHaveApp(wxFrame); MustHaveApp(wxFrame);
class wxFrame : public wxTopLevelWindow { class wxFrame : public wxTopLevelWindow
{
public: public:
%pythonAppend wxFrame "self._setOORInfo(self)" %pythonAppend wxFrame "self._setOORInfo(self)"
%pythonAppend wxFrame() "" %pythonAppend wxFrame() ""
%typemap(out) wxFrame*; // turn off this typemap %typemap(out) wxFrame*; // turn off this typemap
wxFrame(wxWindow* parent, const wxWindowID id=-1, wxFrame(wxWindow* parent,
const wxWindowID id = -1,
const wxString& title = wxPyEmptyString, const wxString& title = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -181,15 +183,14 @@ public:
// Turn it back on again // Turn it back on again
%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); } %typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, $owner); }
bool Create(wxWindow* parent,
bool Create(wxWindow* parent, const wxWindowID id=-1, const wxWindowID id = -1,
const wxString& title = wxPyEmptyString, const wxString& title = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxPyFrameNameStr); const wxString& name = wxPyFrameNameStr);
// frame state // frame state
// ----------- // -----------
@@ -197,23 +198,20 @@ public:
// if the frame has a toolbar) in client coordinates // if the frame has a toolbar) in client coordinates
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const;
// sends a size event to the window using its current size -- this has an // sends a size event to the window using its current size:
// effect of refreshing the window layout // this has a side effect of refreshing the window layout
virtual void SendSizeEvent(); virtual void SendSizeEvent();
// menu bar functions // menu bar functions
// ------------------ // ------------------
virtual void SetMenuBar(wxMenuBar *menubar); virtual void SetMenuBar(wxMenuBar *menubar);
virtual wxMenuBar *GetMenuBar() const; virtual wxMenuBar *GetMenuBar() const;
// process menu command: returns True if processed // process menu command: returns True if processed
bool ProcessCommand(int winid); bool ProcessCommand(int winid);
%pythoncode { Command = ProcessCommand } %pythoncode { Command = ProcessCommand }
// status bar functions // status bar functions
// -------------------- // --------------------
@@ -222,6 +220,7 @@ public:
long style = wxDEFAULT_STATUSBAR_STYLE, long style = wxDEFAULT_STATUSBAR_STYLE,
wxWindowID winid = 0, wxWindowID winid = 0,
const wxString& name = wxPyStatusLineNameStr); const wxString& name = wxPyStatusLineNameStr);
// TODO: with directors? // TODO: with directors?
// // return a new status bar // // return a new status bar
// virtual wxStatusBar *OnCreateStatusBar(int number, // virtual wxStatusBar *OnCreateStatusBar(int number,
@@ -245,7 +244,6 @@ public:
void SetStatusBarPane(int n); void SetStatusBarPane(int n);
int GetStatusBarPane() const; int GetStatusBarPane() const;
// toolbar functions // toolbar functions
// ----------------- // -----------------
@@ -253,6 +251,7 @@ public:
virtual wxToolBar* CreateToolBar(long style = -1, virtual wxToolBar* CreateToolBar(long style = -1,
wxWindowID winid = -1, wxWindowID winid = -1,
const wxString& name = wxPyToolBarNameStr); const wxString& name = wxPyToolBarNameStr);
// TODO: with directors? // TODO: with directors?
// // return a new toolbar // // return a new toolbar
// virtual wxToolBar *OnCreateToolBar(long style, // virtual wxToolBar *OnCreateToolBar(long style,
@@ -263,12 +262,10 @@ public:
virtual wxToolBar *GetToolBar() const; virtual wxToolBar *GetToolBar() const;
virtual void SetToolBar(wxToolBar *toolbar); virtual void SetToolBar(wxToolBar *toolbar);
// show help text (typically in the statusbar); show is False // show help text (typically in the statusbar); show is False
// if you are hiding the help, True otherwise // if you are hiding the help, True otherwise
virtual void DoGiveHelp(const wxString& text, bool show); virtual void DoGiveHelp(const wxString& text, bool show);
// send wxUpdateUIEvents for all menu items in the menubar, // send wxUpdateUIEvents for all menu items in the menubar,
// or just for menu if non-NULL // or just for menu if non-NULL
void DoMenuUpdates(wxMenu* menu = NULL); void DoMenuUpdates(wxMenu* menu = NULL);
@@ -282,16 +279,15 @@ public:
MustHaveApp(wxDialog); MustHaveApp(wxDialog);
class wxDialog : public wxTopLevelWindow { class wxDialog : public wxTopLevelWindow
{
public: public:
enum enum
{ {
// all flags allowed in wxDialogBase::CreateButtonSizer() // all flags allowed in wxDialogBase::CreateButtonSizer()
ButtonSizerFlags = wxOK | wxCANCEL | wxYES | wxNO | wxHELP | wxNO_DEFAULT ButtonSizerFlags = wxOK | wxCANCEL | wxYES | wxNO | wxHELP | wxNO_DEFAULT
}; };
%pythonAppend wxDialog "self._setOORInfo(self)" %pythonAppend wxDialog "self._setOORInfo(self)"
%pythonAppend wxDialog() "" %pythonAppend wxDialog() ""
%typemap(out) wxDialog*; // turn off this typemap %typemap(out) wxDialog*; // turn off this typemap
@@ -316,8 +312,7 @@ public:
long style = wxDEFAULT_DIALOG_STYLE, long style = wxDEFAULT_DIALOG_STYLE,
const wxString& name = wxPyDialogNameStr); const wxString& name = wxPyDialogNameStr);
// the modal dialogs have a return code - usually the ID of the last
// the modal dialogs have a return code - usually the id of the last
// pressed button // pressed button
void SetReturnCode(int returnCode); void SetReturnCode(int returnCode);
int GetReturnCode() const; int GetReturnCode() const;
@@ -362,12 +357,14 @@ public:
MustHaveApp(wxMiniFrame); MustHaveApp(wxMiniFrame);
class wxMiniFrame : public wxFrame { class wxMiniFrame : public wxFrame
{
public: public:
%pythonAppend wxMiniFrame "self._setOORInfo(self)" %pythonAppend wxMiniFrame "self._setOORInfo(self)"
%pythonAppend wxMiniFrame() "" %pythonAppend wxMiniFrame() ""
wxMiniFrame(wxWindow* parent, const wxWindowID id=-1, wxMiniFrame(wxWindow* parent,
const wxWindowID id = -1,
const wxString& title = wxPyEmptyString, const wxString& title = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
@@ -375,13 +372,13 @@ public:
const wxString& name = wxPyFrameNameStr); const wxString& name = wxPyFrameNameStr);
%RenameCtor(PreMiniFrame, wxMiniFrame()); %RenameCtor(PreMiniFrame, wxMiniFrame());
bool Create(wxWindow* parent, const wxWindowID id=-1, bool Create(wxWindow* parent,
const wxWindowID id = -1,
const wxString& title = wxPyEmptyString, const wxString& title = wxPyEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxPyFrameNameStr); const wxString& name = wxPyFrameNameStr);
}; };
@@ -389,7 +386,8 @@ public:
%newgroup %newgroup
enum { enum
{
wxSPLASH_CENTRE_ON_PARENT, wxSPLASH_CENTRE_ON_PARENT,
wxSPLASH_CENTRE_ON_SCREEN, wxSPLASH_CENTRE_ON_SCREEN,
wxSPLASH_NO_CENTRE, wxSPLASH_NO_CENTRE,
@@ -406,7 +404,8 @@ public:
%pythonAppend wxSplashScreenWindow "self._setOORInfo(self)" %pythonAppend wxSplashScreenWindow "self._setOORInfo(self)"
wxSplashScreenWindow(const wxBitmap& bitmap, wxSplashScreenWindow(const wxBitmap& bitmap,
wxWindow* parent, wxWindowID id, wxWindow* parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxNO_BORDER); long style = wxNO_BORDER);
@@ -418,12 +417,15 @@ public:
MustHaveApp(wxSplashScreen); MustHaveApp(wxSplashScreen);
class wxSplashScreen : public wxFrame { class wxSplashScreen : public wxFrame
{
public: public:
%pythonAppend wxSplashScreen "self._setOORInfo(self)" %pythonAppend wxSplashScreen "self._setOORInfo(self)"
wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxSplashScreen(const wxBitmap& bitmap,
wxWindow* parent, wxWindowID id=-1, long splashStyle, int milliseconds,
wxWindow* parent,
wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP); long style = wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP);