X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..9ae8168e5b1072e3a401abca3b0f40bc6afcc6ae:/include/wx/motif/mdi.h?ds=inline diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index ee822b515f..e0a5eba942 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,7 +156,7 @@ 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(); @@ -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() };