X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ca6a5f04692678cd2d9f3ea0843fc3f5a0b254f..644e896d3f855f2a85cc2f8bd1532b352cf30768:/include/wx/msw/minifram.h?ds=inline diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h index 116371e281..ac32099044 100644 --- a/include/wx/msw/minifram.h +++ b/include/wx/msw/minifram.h @@ -12,19 +12,18 @@ #ifndef _WX_MINIFRAM_H_ #define _WX_MINIFRAM_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "minifram.h" #endif #include "wx/frame.h" -#ifdef __WIN32__ - class WXDLLEXPORT wxMiniFrame : public wxFrame { public: wxMiniFrame() { } - wxMiniFrame(wxWindow *parent, + + bool Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, @@ -32,39 +31,26 @@ public: long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, const wxString& name = wxFrameNameStr) { - Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name); + return wxFrame::Create(parent, id, title, pos, size, + style | + wxFRAME_TOOL_WINDOW | + (parent ? wxFRAME_FLOAT_ON_PARENT : 0), name); } -protected: - DECLARE_DYNAMIC_CLASS(wxMiniFrame) -}; - - -#else // !Win32 - -class WXDLLEXPORT wxMiniFrame : public wxFrame -{ -public: - wxMiniFrame() { } wxMiniFrame(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION_HORIZ, + long style = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, const wxString& name = wxFrameNameStr) { Create(parent, id, title, pos, size, style, name); } - virtual ~wxMiniFrame(); - - virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); - - DECLARE_DYNAMIC_CLASS(wxMiniFrame) +protected: + DECLARE_DYNAMIC_CLASS_NO_COPY(wxMiniFrame) }; -#endif // Win32/!Win32 - #endif // _WX_MINIFRAM_H_