X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..e3c55eb333d273693ed2aea23da909b33e9e5484:/include/wx/motif/mdi.h diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index 50bcf4f5d1..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; @@ -152,13 +149,14 @@ public: // Set icon virtual void SetIcon(const wxIcon& icon); - + virtual void SetIcons(const wxIconBundle& icons ); + // Override wxFrame operations void CaptureMouse(); 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(); @@ -230,6 +228,8 @@ public: // Implementation void OnPageChanged(wxNotebookEvent& event); + + int FindPage(const wxNotebookPage* page); protected: virtual void DoSetSize(int x, int y, @@ -241,7 +241,6 @@ protected: void DoGetSize(int *width, int *height) const ; void DoGetPosition(int *x, int *y) const ; - private: DECLARE_EVENT_TABLE() };