projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor wxStaticText::Ellipsize so it's a static public utility function; document...
[wxWidgets.git]
/
include
/
wx
/
gtk
/
minifram.h
diff --git
a/include/wx/gtk/minifram.h
b/include/wx/gtk/minifram.h
index 5f62b0af38e17982369feaa557ebcca3c51e6dbb..7cda4e321640bd4c6f73bff563095443fe6b0b74 100644
(file)
--- a/
include/wx/gtk/minifram.h
+++ b/
include/wx/gtk/minifram.h
@@
-7,31
+7,17
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifndef _
_GTKMINIFRAMEH_
_
-#define _
_GTKMINIFRAMEH_
_
+#ifndef _
WX_GTK_MINIFRAME_H
_
+#define _
WX_GTK_MINIFRAME_H
_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-#if wxUSE_MINIFRAME
-
-#include "wx/object.h"
+#include "wx/bitmap.h"
#include "wx/frame.h"
#include "wx/frame.h"
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxMiniFrame;
-
//-----------------------------------------------------------------------------
// wxMiniFrame
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxMiniFrame
//-----------------------------------------------------------------------------
-class wxMiniFrame: public wxFrame
+class
WXDLLIMPEXP_CORE
wxMiniFrame: public wxFrame
{
DECLARE_DYNAMIC_CLASS(wxMiniFrame)
{
DECLARE_DYNAMIC_CLASS(wxMiniFrame)
@@
-42,7
+28,7
@@
public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- long style = wx
DEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ
,
+ long style = wx
CAPTION | wxRESIZE_BORDER
,
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
const wxString& name = wxFrameNameStr)
{
Create(parent, id, title, pos, size, style, name);
@@
-53,18
+39,25
@@
public:
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- long style = wx
DEFAULT_FRAME_STYLE | wxTINY_CAPTION_HORIZ
,
+ long style = wx
CAPTION | wxRESIZE_BORDER
,
const wxString& name = wxFrameNameStr);
virtual void SetTitle( const wxString &title );
const wxString& name = wxFrameNameStr);
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
// implementation
-
+public:
bool m_isDragging;
int m_oldX,m_oldY;
int m_diffX,m_diffY;
bool m_isDragging;
int m_oldX,m_oldY;
int m_diffX,m_diffY;
+ wxBitmap m_closeButton;
+ int m_miniEdge;
+ int m_miniTitle;
};
};
-#endif
-
-#endif
- // __GTKMINIFRAMEH__
+#endif // _WX_GTK_MINIFRAME_H_