projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with the caret positioning after SetValue() introduced by the last commit
[wxWidgets.git]
/
include
/
wx
/
msw
/
frame.h
diff --git
a/include/wx/msw/frame.h
b/include/wx/msw/frame.h
index abd5752e93683a1b31b97acee4a67d4e5a6b5b88..300931980a5020cdb999ea90e00f590f89870e0e 100644
(file)
--- a/
include/wx/msw/frame.h
+++ b/
include/wx/msw/frame.h
@@
-1,6
+1,6
@@
/////////////////////////////////////////////////////////////////////////////
// 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
// Author: Julian Smart
// Modified by:
// Created: 01/02/97
@@
-16,12
+16,12
@@
#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,25
+42,15
@@
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
void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
// event handlers
void OnActivate(wxActivateEvent& event);
void OnSysColourChanged(wxSysColourChangedEvent& event);
@@
-102,10
+92,6
@@
public:
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu);
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);
-
// tooltip management
#if wxUSE_TOOLTIPS
WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
// tooltip management
#if wxUSE_TOOLTIPS
WXHWND GetToolTipCtrl() const { return m_hwndToolTip; }
@@
-124,14
+110,8
@@
protected:
// common part of all ctors
void Init();
// 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
@@
-154,14
+134,8
@@
protected:
virtual bool IsMDIChild() const { return FALSE; }
virtual bool IsMDIChild() const { return FALSE; }
- // is the frame currently iconized?
- bool m_iconized;
-
- // 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;
-
- WXHICON m_defaultIcon;
+ // get default (wxWindows) icon for the frame
+ virtual WXHICON GetDefaultIcon() const;
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
#if wxUSE_STATUSBAR
static bool m_useNativeStatusBar;
@@
-171,22
+145,21
@@
protected:
wxWindow *m_winLastFocused;
// Data to save/restore when calling ShowFullScreen
wxWindow *m_winLastFocused;
// 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;
// WXHMENU m_fsMenu;
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(wxFrame)
};
#endif
};
#endif