X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b854a32613f34669af815e1416a6c623a4c2c5b..85047589a993f5c5529e1dae284be8af84cd68ef:/include/wx/gtk/minifram.h?ds=inline diff --git a/include/wx/gtk/minifram.h b/include/wx/gtk/minifram.h index 3747e49ffc..de339f016a 100644 --- a/include/wx/gtk/minifram.h +++ b/include/wx/gtk/minifram.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: minifram.h +// Name: wx/gtk/minifram.h // Purpose: wxMiniFrame class // Author: Robert Roebling // RCS-ID: $Id$ @@ -7,28 +7,17 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKMINIFRAMEH__ -#define __GTKMINIFRAMEH__ +#ifndef _WX_GTK_MINIFRAME_H_ +#define _WX_GTK_MINIFRAME_H_ -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" +#include "wx/bitmap.h" #include "wx/frame.h" -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxMiniFrame; - //----------------------------------------------------------------------------- // wxMiniFrame //----------------------------------------------------------------------------- -class wxMiniFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame { DECLARE_DYNAMIC_CLASS(wxMiniFrame) @@ -39,7 +28,7 @@ public: const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ, + long style = wxCAPTION | wxRESIZE_BORDER, const wxString& name = wxFrameNameStr) { Create(parent, id, title, pos, size, style, name); @@ -50,20 +39,25 @@ public: const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ, + long style = wxCAPTION | wxRESIZE_BORDER, const wxString& name = wxFrameNameStr); - // implementation + virtual void SetTitle( const wxString &title ); + +protected: + virtual void DoSetSizeHints( int minW, int minH, + int maxW, int maxH, + int incW, int incH ); + virtual void DoGetClientSize(int* width, int* height) const; + + // implementation +public: bool m_isDragging; int m_oldX,m_oldY; int m_diffX,m_diffY; - - void DrawFrame( int x, int y ); - void OnPaint( wxPaintEvent &event ); - void OnMouse( wxMouseEvent &event ); - - DECLARE_EVENT_TABLE() + wxBitmap m_closeButton; + int m_miniEdge; + int m_miniTitle; }; -#endif - // __GTKMINIFRAMEH__ +#endif // _WX_GTK_MINIFRAME_H_