#ifndef _WX_MDIG_H_
#define _WX_MDIG_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "mdig.h"
#endif
public:
wxGenericMDIParentFrame();
wxGenericMDIParentFrame(wxWindow *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
~wxGenericMDIParentFrame();
bool Create( wxWindow *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
public:
wxGenericMDIChildFrame();
wxGenericMDIChildFrame( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
virtual ~wxGenericMDIChildFrame();
bool Create( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
// no status bars
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number) = 1,
long WXUNUSED(style) = 1,
- wxWindowID WXUNUSED(id) = 1,
+ wxWindowID WXUNUSED(winid) = 1,
const wxString& WXUNUSED(name) = wxEmptyString)
{ return (wxStatusBar*)NULL; }
// no size hints
virtual void SetSizeHints( int WXUNUSED(minW),
int WXUNUSED(minH),
- int WXUNUSED(maxW) = -1,
- int WXUNUSED(maxH) = -1,
- int WXUNUSED(incW) = -1,
- int WXUNUSED(incH) = -1) {}
+ int WXUNUSED(maxW) = wxDefaultCoord,
+ int WXUNUSED(maxH) = wxDefaultCoord,
+ int WXUNUSED(incW) = wxDefaultCoord,
+ int WXUNUSED(incH) = wxDefaultCoord) {}
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
- wxWindowID WXUNUSED(id),
+ wxWindowID WXUNUSED(winid),
const wxString& WXUNUSED(name) )
{ return (wxToolBar*)NULL; }
virtual wxToolBar *GetToolBar() const { return (wxToolBar*)NULL; }
#endif
// no icon
- void SetIcon( const wxIcon &icon ) { /*m_icons = wxIconBundle( icon );*/}
- void SetIcons( const wxIconBundle &icons ) { /*m_icons = icons;*/ }
+ void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
+ void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
// no maximize etc
- virtual void Maximize( bool WXUNUSED(maximize) = TRUE) { /* Has no effect */ }
+ virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }
virtual void Restore() { /* Has no effect */ }
- virtual void Iconize(bool WXUNUSED(iconize) = TRUE) { /* Has no effect */ }
- virtual bool IsMaximized() const { return TRUE; }
- virtual bool IsIconized() const { return FALSE; }
- virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return FALSE; }
- virtual bool IsFullScreen() const { return FALSE; }
+ virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ }
+ virtual bool IsMaximized() const { return true; }
+ virtual bool IsIconized() const { return false; }
+ virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
+ virtual bool IsFullScreen() const { return false; }
- virtual bool IsTopLevel() const { return FALSE; }
+ virtual bool IsTopLevel() const { return false; }
void OnMenuHighlight(wxMenuEvent& event);
void OnActivate(wxActivateEvent& event);
~wxGenericMDIClientWindow();
virtual bool CreateClient( wxGenericMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL );
- virtual int SetSelection(int nPage);
+ virtual int SetSelection(size_t nPage);
protected:
void PageChanged(int OldSelection, int newSelection);
*/
#ifndef wxUSE_GENERIC_MDI_AS_NATIVE
-#if defined(__WXUNIVERSAL__) || defined(__WXPM__)
+#if defined(__WXUNIVERSAL__) || defined(__WXPM__) || defined(__WXCOCOA__)
#define wxUSE_GENERIC_MDI_AS_NATIVE 1
#else
#define wxUSE_GENERIC_MDI_AS_NATIVE 0
public:
wxMDIParentFrame() {}
wxMDIParentFrame(wxWindow *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
const wxString& name = wxFrameNameStr)
- :wxGenericMDIParentFrame(parent, id, title, pos, size, style, name)
- {
- }
+ :wxGenericMDIParentFrame(parent, winid, title, pos, size, style, name)
+ {
+ }
wxMDIChildFrame * GetActiveChild() const ;
-
-
+
+
private:
DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
};
wxMDIChildFrame() {}
wxMDIChildFrame( wxGenericMDIParentFrame *parent,
- wxWindowID id,
+ wxWindowID winid,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr )
- :wxGenericMDIChildFrame(parent, id, title, pos, size, style, name)
- {
- }
-
+ :wxGenericMDIChildFrame(parent, winid, title, pos, size, style, name)
+ {
+ }
private:
DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
};