projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxParseWildcard added instead of methods hidden under wxUSE_FILEDLG and wxUSE_DIRDLG.
[wxWidgets.git]
/
include
/
wx
/
msw
/
frame.h
diff --git
a/include/wx/msw/frame.h
b/include/wx/msw/frame.h
index abd5752e93683a1b31b97acee4a67d4e5a6b5b88..b858afcd54765bb10daffb4ace426c5817218e24 100644
(file)
--- a/
include/wx/msw/frame.h
+++ b/
include/wx/msw/frame.h
@@
-1,27
+1,27
@@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/frame.h
/////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/frame.h
-// Purpose: wxFrame
MSW
class
+// Purpose: wxFrame class
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
and Markus Holzem
-// Licence: wxWindows licen
s
e
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "frame.h"
#endif
#pragma interface "frame.h"
#endif
-class WXDLLEXPORT wxFrame
MSW
: public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase
{
public:
// construction
{
public:
// construction
- wxFrame
MSW
() { Init(); }
- wxFrame
MSW
(wxWindow *parent,
+ wxFrame() { Init(); }
+ wxFrame(wxWindow *parent,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
@@
-42,32
+42,21
@@
public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr);
- virtual ~wxFrame
MSW
();
+ virtual ~wxFrame();
// implement base class pure virtuals
// implement base class pure virtuals
- virtual void Raise();
- virtual void Maximize(bool maximize = TRUE);
- virtual bool IsMaximized() const;
- virtual void Iconize(bool iconize = TRUE);
- virtual bool IsIconized() const;
- virtual void Restore();
- virtual void SetIcon(const wxIcon& icon);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
- virtual
bool IsFullScreen() const { return m_fsIsShowing; }
;
+ virtual
void Raise()
;
// implementation only from now on
// -------------------------------
// implementation only from now on
// -------------------------------
- // override some more virtuals
- virtual bool Show(bool show = TRUE);
-
// event handlers
// event handlers
- void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Toolbar
#if wxUSE_TOOLBAR
void OnSysColourChanged(wxSysColourChangedEvent& event);
// Toolbar
#if wxUSE_TOOLBAR
- virtual wxToolBar* CreateToolBar(long style =
wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT
,
+ virtual wxToolBar* CreateToolBar(long style =
-1
,
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
@@
-101,10
+90,7
@@
public:
bool HandleSize(int x, int y, WXUINT flag);
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
bool HandleSize(int x, int y, WXUINT flag);
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
-
- bool MSWCreate(int id, wxWindow *parent, const wxChar *wclass,
- wxWindow *wx_win, const wxChar *title,
- int x, int y, int width, int height, long style);
+ bool HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup);
// tooltip management
#if wxUSE_TOOLTIPS
// tooltip management
#if wxUSE_TOOLTIPS
@@
-114,24
+100,16
@@
public:
// a MSW only function which sends a size event to the window using its
// current size - this has an effect of refreshing the window layout
// a MSW only function which sends a size event to the window using its
// current size - this has an effect of refreshing the window layout
- void SendSizeEvent();
-
- // called by wxWindow whenever it gets focus
- void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
- wxWindow *GetLastFocus() const { return m_winLastFocused; }
+ virtual void SendSizeEvent();
+ virtual wxPoint GetClientAreaOrigin() const;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
- // common part of Iconize(), Maximize() and Restore()
- void DoShowWindow(int nShowCmd);
-
// override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const;
// override base class virtuals
virtual void DoGetClientSize(int *width, int *height) const;
- virtual void DoGetSize(int *width, int *height) const;
- virtual void DoGetPosition(int *x, int *y) const;
-
virtual void DoSetClientSize(int width, int height);
#if wxUSE_MENUS_NATIVE
virtual void DoSetClientSize(int width, int height);
#if wxUSE_MENUS_NATIVE
@@
-150,43
+128,35
@@
protected:
bool MSWTranslateMessage(WXMSG* pMsg);
// window proc for the frames
bool MSWTranslateMessage(WXMSG* pMsg);
// window proc for the frames
- long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-
- virtual bool IsMDIChild() const { return FALSE; }
+ WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
- //
is the frame currently iconized?
- bool
m_iconized
;
+ //
handle WM_INITMENUPOPUP message
+ bool
HandleInitMenuPopup(WXHMENU hMenu)
;
- // should the frame be maximized when it will be shown? set by Maximize()
- // when it is called while the frame is hidden
- bool m_maximizeOnShow;
+ virtual bool IsMDIChild() const { return FALSE; }
- WXHICON m_defaultIcon;
+ // get default (wxWidgets) icon for the frame
+ virtual WXHICON GetDefaultIcon() const;
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
#endif // wxUSE_STATUSBAR
- // the last focused child: we restore focus to it on activation
- wxWindow *m_winLastFocused;
-
// Data to save/restore when calling ShowFullScreen
// Data to save/restore when calling ShowFullScreen
- long m_fsStyle; // Passed to ShowFullScreen
- wxRect m_fsOldSize;
- long m_fsOldWindowStyle;
int m_fsStatusBarFields; // 0 for no status bar
int m_fsStatusBarHeight;
int m_fsToolBarHeight;
int m_fsStatusBarFields; // 0 for no status bar
int m_fsStatusBarHeight;
int m_fsToolBarHeight;
-// WXHMENU m_fsMenu;
- bool m_fsIsMaximized;
- bool m_fsIsShowing;
private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
private:
#if wxUSE_TOOLTIPS
WXHWND m_hwndToolTip;
#endif // tooltips
+ // used by IconizeChildFrames(), see comments there
+ bool m_wasMinimized;
+
DECLARE_EVENT_TABLE()
DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxFrame)
};
#endif
};
#endif