proper fullscreen handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,32 +16,68 @@
|
||||
#endif
|
||||
|
||||
#include "wx/univ/inpcons.h"
|
||||
#include "wx/univ/inphand.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// constants
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// frame decorations type flags used in wxRenderer and wxColourScheme
|
||||
// (also used for hit tests)
|
||||
enum
|
||||
{
|
||||
wxTOPLEVEL_BORDER = 0x00000001,
|
||||
wxTOPLEVEL_ACTIVE = 0x00000001,
|
||||
wxTOPLEVEL_MAXIMIZED = 0x00000002,
|
||||
wxTOPLEVEL_TITLEBAR = 0x00000004,
|
||||
wxTOPLEVEL_RESIZEABLE = 0x00000008,
|
||||
wxTOPLEVEL_ICON = 0x00000010,
|
||||
wxTOPLEVEL_CLOSE_BUTTON = 0x00000020,
|
||||
wxTOPLEVEL_MAXIMIZE_BUTTON = 0x00000040,
|
||||
wxTOPLEVEL_MINIMIZE_BUTTON = 0x00000080,
|
||||
wxTOPLEVEL_RESTORE_BUTTON = 0x00000100,
|
||||
wxTOPLEVEL_HELP_BUTTON = 0x00000200,
|
||||
wxTOPLEVEL_ACTIVE = 0x00000400
|
||||
wxTOPLEVEL_BUTTON_CLOSE = 0x00000020,
|
||||
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x00000040,
|
||||
wxTOPLEVEL_BUTTON_MINIMIZE = 0x00000080,
|
||||
wxTOPLEVEL_BUTTON_RESTORE = 0x00000100,
|
||||
wxTOPLEVEL_BUTTON_HELP = 0x00000200,
|
||||
wxTOPLEVEL_BORDER = 0x00000400,
|
||||
};
|
||||
|
||||
// frame hit test return values:
|
||||
enum
|
||||
{
|
||||
wxHT_TOPLEVEL_NOWHERE = 0,
|
||||
wxHT_TOPLEVEL_CLIENT_AREA,
|
||||
wxHT_TOPLEVEL_ICON,
|
||||
wxHT_TOPLEVEL_TITLEBAR,
|
||||
wxHT_TOPLEVEL_BUTTON_CLOSE = wxTOPLEVEL_BUTTON_CLOSE,
|
||||
wxHT_TOPLEVEL_BUTTON_MAXIMIZE = wxTOPLEVEL_BUTTON_MAXIMIZE,
|
||||
wxHT_TOPLEVEL_BUTTON_MINIMIZE = wxTOPLEVEL_BUTTON_MINIMIZE,
|
||||
wxHT_TOPLEVEL_BUTTON_RESTORE = wxTOPLEVEL_BUTTON_RESTORE,
|
||||
wxHT_TOPLEVEL_BUTTON_HELP = wxTOPLEVEL_BUTTON_HELP,
|
||||
wxHT_TOPLEVEL_BORDER_N,
|
||||
wxHT_TOPLEVEL_BORDER_S,
|
||||
wxHT_TOPLEVEL_BORDER_E,
|
||||
wxHT_TOPLEVEL_BORDER_W,
|
||||
wxHT_TOPLEVEL_BORDER_NE = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_E,
|
||||
wxHT_TOPLEVEL_BORDER_SE = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_E,
|
||||
wxHT_TOPLEVEL_BORDER_NW = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_W,
|
||||
wxHT_TOPLEVEL_BORDER_SW = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_W,
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// the actions supported by this control
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#define wxACTION_TOPLEVEL_ACTIVATE _T("activate") // (de)activate the frame
|
||||
#define wxACTION_TOPLEVEL_CLOSE _T("close") // close the frame
|
||||
#define wxACTION_TOPLEVEL_MAXIMIZE _T("maximize") // maximize the frame
|
||||
#define wxACTION_TOPLEVEL_MINIMIZE _T("minimize") // minimize the frame
|
||||
#define wxACTION_TOPLEVEL_RESTORE _T("restore") // undo maximization
|
||||
#define wxACTION_TOPLEVEL_CONTEXT_HELP _T("contexthelp")// context help mode
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxTopLevelWindow
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative
|
||||
class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative,
|
||||
public wxInputConsumer
|
||||
{
|
||||
public:
|
||||
// construction
|
||||
@@ -78,14 +114,17 @@ public:
|
||||
// --------------------------
|
||||
|
||||
protected:
|
||||
virtual bool PerformAction(const wxControlAction& action,
|
||||
long numArg = -1,
|
||||
const wxString& strArg = wxEmptyString);
|
||||
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
|
||||
|
||||
// common part of all ctors
|
||||
void Init();
|
||||
|
||||
// return wxTOPLEVEL_xxx combination based on current state of the frame
|
||||
long GetDecorationsStyle() const;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
|
||||
DECLARE_EVENT_TABLE()
|
||||
void OnNcPaint(wxPaintEvent& event);
|
||||
|
||||
// TRUE if wxTLW should render decorations (aka titlebar) itself
|
||||
@@ -94,7 +133,27 @@ protected:
|
||||
bool m_isActive:1;
|
||||
// version of icon for titlebar (16x16)
|
||||
wxIcon m_titlebarIcon;
|
||||
|
||||
// saved window style in fullscreen mdoe
|
||||
long m_fsSavedStyle;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
|
||||
DECLARE_EVENT_TABLE()
|
||||
WX_DECLARE_INPUT_CONSUMER()
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxStdFrameInputHandler: handles focus, resizing and titlebar buttons clicks
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxStdFrameInputHandler : public wxStdInputHandler
|
||||
{
|
||||
public:
|
||||
wxStdFrameInputHandler(wxInputHandler *inphand);
|
||||
|
||||
virtual bool HandleMouse(wxInputConsumer *consumer,
|
||||
const wxMouseEvent& event);
|
||||
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
|
||||
virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
|
||||
};
|
||||
|
||||
#endif // __WX_UNIV_TOPLEVEL_H__
|
||||
|
Reference in New Issue
Block a user