X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..6ca154fcc14a2532798a23977baee2eed3179d19:/include/wx/motif/mdi.h diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index ee822b515f..e6026188df 100644 --- a/include/wx/motif/mdi.h +++ b/include/wx/motif/mdi.h @@ -12,7 +12,7 @@ #ifndef _WX_MDI_H_ #define _WX_MDI_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "mdi.h" #endif @@ -27,9 +27,6 @@ but wxMDIChildFrame::GetParent should return the parent frame. #include "wx/frame.h" #include "wx/notebook.h" -WXDLLEXPORT_DATA(extern const char*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const char*) wxStatusLineNameStr; - class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -159,20 +156,20 @@ public: void ReleaseMouse(); void Raise(); void Lower(void); - void SetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1); + void DoSetSizeHints(int minW = -1, int minH = -1, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1); // MDI operations virtual void Maximize(); virtual void Maximize(bool WXUNUSED(maximize)) { }; - inline void Minimize() { Iconize(TRUE); }; + inline void Minimize() { Iconize(true); }; virtual void Iconize(bool iconize); virtual void Restore(); virtual void Activate(); virtual bool IsIconized() const ; - virtual bool IsTopLevel() const { return FALSE; } + virtual bool IsTopLevel() const { return false; } - // Is the frame maximized? Returns TRUE for + // Is the frame maximized? Returns true for // wxMDIChildFrame due to the tabbed implementation. virtual bool IsMaximized(void) const ; @@ -231,6 +228,8 @@ public: // Implementation void OnPageChanged(wxNotebookEvent& event); + + int FindPage(const wxNotebookPage* page); protected: virtual void DoSetSize(int x, int y, @@ -242,7 +241,6 @@ protected: void DoGetSize(int *width, int *height) const ; void DoGetPosition(int *x, int *y) const ; - private: DECLARE_EVENT_TABLE() };