Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input handling in wxTLW/Univ

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-09-28 23:39:55 +00:00
parent e8c12a53e8
commit 813edf09b3
7 changed files with 362 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/univ/inpcons.h
View File

@@ -90,7 +90,9 @@ private: \
void OnKeyDown(wxKeyEvent& event); \
void OnKeyUp(wxKeyEvent& event); \
void OnFocus(wxFocusEvent& event); \
void OnActivate(wxActivateEvent& event);
public: /* because of docview :-( */ \
void OnActivate(wxActivateEvent& event); \
private:
// implement the event table entries for wxControlContainer
#define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \
@@ -134,7 +136,7 @@ private: \
void classname::OnActivate(wxActivateEvent& event) \
{ \
wxInputConsumer::OnActivate(event); \
}
} \
#endif // _WX_UNIV_INPCONS_H_

1
include/wx/univ/inphand.h
View File

@@ -36,6 +36,7 @@
#define wxINP_HANDLER_SLIDER _T("slider")
#define wxINP_HANDLER_SPINBTN _T("spinbtn")
#define wxINP_HANDLER_TEXTCTRL _T("textctrl")
#define wxINP_HANDLER_TOPLEVEL _T("toplevel")
// ----------------------------------------------------------------------------
// wxInputHandler: maps the events to the actions

17
include/wx/univ/renderer.h
View File

@@ -251,7 +251,8 @@ public:
const wxString& title,
const wxIcon& icon,
int flags,
int pressedButtons = 0) = 0;
int specialButton = 0,
int specialButtonFlags = 0) = 0;
// draw frame borders
virtual void DrawFrameBorder(wxDC& dc,
@@ -392,6 +393,10 @@ public:
virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const = 0;
// get titlebar icon size
virtual wxSize GetFrameIconSize() const = 0;
// returns one of wxHT_TOPLEVEL_XXX constants
virtual int HitTestFrame(const wxRect& rect,
const wxPoint& pt,
int flags) const = 0;
// virtual dtor for any base class
virtual ~wxRenderer();
@@ -622,8 +627,10 @@ public:
const wxString& title,
const wxIcon& icon,
int flags,
int pressedButtons = 0)
{ m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags, pressedButtons); }
int specialButton = 0,
int specialButtonFlag = 0)
{ m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags,
specialButton, specialButtonFlag); }
virtual void DrawFrameBorder(wxDC& dc,
const wxRect& rect,
int flags)
@@ -723,6 +730,10 @@ public:
{ return m_renderer->GetFrameTotalSize(clientSize, flags); }
virtual wxSize GetFrameIconSize() const
{ return m_renderer->GetFrameIconSize(); }
virtual int HitTestFrame(const wxRect& rect,
const wxPoint& pt,
int flags) const
{ return m_renderer->HitTestFrame(rect, pt, flags); }
protected:
wxRenderer *m_renderer;

88
include/wx/univ/toplevel.h
View File

@@ -23,54 +23,57 @@
// ----------------------------------------------------------------------------
// frame decorations type flags used in wxRenderer and wxColourScheme
// (also used for hit tests)
enum
{
wxTOPLEVEL_ACTIVE = 0x00000001,
wxTOPLEVEL_MAXIMIZED = 0x00000002,
wxTOPLEVEL_TITLEBAR = 0x00000004,
wxTOPLEVEL_RESIZEABLE = 0x00000008,
wxTOPLEVEL_ICON = 0x00000010,
wxTOPLEVEL_BUTTON_CLOSE = 0x00000020,
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x00000040,
wxTOPLEVEL_BUTTON_MINIMIZE = 0x00000080,
wxTOPLEVEL_BUTTON_RESTORE = 0x00000100,
wxTOPLEVEL_BUTTON_HELP = 0x00000200,
wxTOPLEVEL_BORDER = 0x00000400,
wxTOPLEVEL_ICON = 0x00000009,
wxTOPLEVEL_RESIZEABLE = 0x00000010,
wxTOPLEVEL_BORDER = 0x00000020,
wxTOPLEVEL_BUTTON_CLOSE = 0x01000000,
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
wxTOPLEVEL_BUTTON_ICONIZE = 0x04000000,
wxTOPLEVEL_BUTTON_RESTORE = 0x08000000,
wxTOPLEVEL_BUTTON_HELP = 0x10000000,
};
// 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,
wxHT_TOPLEVEL_NOWHERE = 0x00000000,
wxHT_TOPLEVEL_CLIENT_AREA = 0x00000001,
wxHT_TOPLEVEL_ICON = 0x00000002,
wxHT_TOPLEVEL_TITLEBAR = 0x00000004,
wxHT_TOPLEVEL_BORDER_N = 0x00000010,
wxHT_TOPLEVEL_BORDER_S = 0x00000020,
wxHT_TOPLEVEL_BORDER_E = 0x00000040,
wxHT_TOPLEVEL_BORDER_W = 0x00000080,
wxHT_TOPLEVEL_ANY_BORDER = 0x000000F0,
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,
wxHT_TOPLEVEL_BUTTON_CLOSE = /*0x01000000*/ wxTOPLEVEL_BUTTON_CLOSE,
wxHT_TOPLEVEL_BUTTON_MAXIMIZE = /*0x02000000*/ wxTOPLEVEL_BUTTON_MAXIMIZE,
wxHT_TOPLEVEL_BUTTON_ICONIZE = /*0x04000000*/ wxTOPLEVEL_BUTTON_ICONIZE,
wxHT_TOPLEVEL_BUTTON_RESTORE = /*0x08000000*/ wxTOPLEVEL_BUTTON_RESTORE,
wxHT_TOPLEVEL_BUTTON_HELP = /*0x10000000*/ wxTOPLEVEL_BUTTON_HELP,
wxHT_TOPLEVEL_ANY_BUTTON = 0x1F000000
};
// ----------------------------------------------------------------------------
// 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
#define wxACTION_TOPLEVEL_ACTIVATE _T("activate") // (de)activate the frame
#define wxACTION_TOPLEVEL_BUTTON_PRESS _T("pressbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_RELEASE _T("releasebtn") // press titlebar btn
#define wxACTION_TOPLEVEL_BUTTON_CLICK _T("clickbtn") // press titlebar btn
#define wxACTION_TOPLEVEL_MOVE _T("move") // move the frame
#define wxACTION_TOPLEVEL_RESIZE _T("resize") // resize the frame
//-----------------------------------------------------------------------------
// wxTopLevelWindow
@@ -112,19 +115,26 @@ public:
// implementation from now on
// --------------------------
// tests for frame's part at given point
long HitTest(const wxPoint& pt) const;
protected:
virtual bool PerformAction(const wxControlAction& action,
long numArg = -1,
const wxString& strArg = wxEmptyString);
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
// handle titlebar button click event
virtual void ClickTitleBarButton(long button);
// common part of all ctors
void Init();
virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
// return wxTOPLEVEL_xxx combination based on current state of the frame
long GetDecorationsStyle() const;
// common part of all ctors
void Init();
void RefreshTitleBar();
void OnNcPaint(wxPaintEvent& event);
// TRUE if wxTLW should render decorations (aka titlebar) itself
@@ -135,6 +145,8 @@ protected:
wxIcon m_titlebarIcon;
// saved window style in fullscreen mdoe
long m_fsSavedStyle;
// currently pressed titlebar button
long m_pressedButton;
DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
DECLARE_EVENT_TABLE()
@@ -154,6 +166,12 @@ public:
const wxMouseEvent& event);
virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
private:
// the window (button) which has capture or NULL and the last hittest result
wxTopLevelWindow *m_winCapture;
long m_winHitTest;
long m_winPressed;
};
#endif // __WX_UNIV_TOPLEVEL_H__