X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..c2bbeff0048b6f02bf1ef41edc6c7a3ce148f907:/include/wx/msw/minifram.h?ds=inline diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h index 54d025e255..1e34b5d88d 100644 --- a/include/wx/msw/minifram.h +++ b/include/wx/msw/minifram.h @@ -1,16 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: minifram.h +// Name: wx/msw/minifram.h // Purpose: wxMiniFrame class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __MINIFRAMH__ -#define __MINIFRAMH__ +#ifndef _WX_MINIFRAM_H_ +#define _WX_MINIFRAM_H_ #ifdef __GNUG__ #pragma interface "minifram.h" @@ -18,29 +18,56 @@ #include "wx/frame.h" -class WXDLLEXPORT wxMiniFrame: public wxFrame { +#ifdef __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 = wxCAPTION | wxCLIP_CHILDREN | wxRESIZE_BORDER, + const wxString& name = wxFrameNameStr) + { + 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: - inline wxMiniFrame(void) {} - inline wxMiniFrame(wxWindow *parent, - const wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const long style = wxDEFAULT_FRAME|wxTINY_CAPTION_HORIZ, - const wxString& name = wxFrameNameStr) + 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, + const wxString& name = wxFrameNameStr) { Create(parent, id, title, pos, size, style, name); } - ~wxMiniFrame(void); + virtual ~wxMiniFrame(); - long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); -protected: + DECLARE_DYNAMIC_CLASS(wxMiniFrame) }; +#endif // Win32/!Win32 + #endif - // __MINIFRAMH__ + // _WX_MINIFRAM_H_