projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respect GTK+'s theme tooltip colour settings
[wxWidgets.git]
/
include
/
wx
/
msw
/
toplevel.h
diff --git
a/include/wx/msw/toplevel.h
b/include/wx/msw/toplevel.h
index 358f7e55da2324116be4eee9da911a5cd009a8e9..86247ab774e3ce59000778e709aaf8677d12f5dc 100644
(file)
--- a/
include/wx/msw/toplevel.h
+++ b/
include/wx/msw/toplevel.h
@@
-12,7
+12,7
@@
#ifndef _WX_MSW_TOPLEVEL_H_
#define _WX_MSW_TOPLEVEL_H_
#ifndef _WX_MSW_TOPLEVEL_H_
#define _WX_MSW_TOPLEVEL_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "toplevel.h"
#endif
#pragma interface "toplevel.h"
#endif
@@
-55,8
+55,13
@@
public:
virtual void Iconize(bool iconize = TRUE);
virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon);
virtual void Iconize(bool iconize = TRUE);
virtual bool IsIconized() const;
virtual void SetIcon(const wxIcon& icon);
+ virtual void SetIcons(const wxIconBundle& icons );
virtual void Restore();
virtual void Restore();
+#ifndef __WXWINCE__
+ virtual bool SetShape(const wxRegion& region);
+#endif // __WXWINCE__
+
virtual bool Show(bool show = TRUE);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool Show(bool show = TRUE);
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@
-69,6
+74,13
@@
public:
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
+ // event handlers
+ void OnActivate(wxActivateEvent& event);
+
+ // called by wxWindow whenever it gets focus
+ void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
+ wxWindow *GetLastFocus() const { return m_winLastFocused; }
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-88,10
+100,13
@@
protected:
// common part of Iconize(), Maximize() and Restore()
void DoShowWindow(int nShowCmd);
// common part of Iconize(), Maximize() and Restore()
void DoShowWindow(int nShowCmd);
- // translate wxWi
ndow
s flags to Windows ones
+ // translate wxWi
dget
s flags to Windows ones
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
- // is the frame currently iconized?
+ // choose the right parent to use with CreateWindow()
+ virtual WXHWND MSWGetParent() const;
+
+ // is the window currently iconized?
bool m_iconized;
// should the frame be maximized when it will be shown? set by Maximize()
bool m_iconized;
// should the frame be maximized when it will be shown? set by Maximize()
@@
-104,10
+119,13
@@
protected:
long m_fsOldWindowStyle;
bool m_fsIsMaximized;
bool m_fsIsShowing;
long m_fsOldWindowStyle;
bool m_fsIsMaximized;
bool m_fsIsShowing;
-};
-// list of all frames and modeless dialogs
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+ // the last focused child: we restore focus to it on activation
+ wxWindow *m_winLastFocused;
+
+ DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)
+};
#endif // _WX_MSW_TOPLEVEL_H_
#endif // _WX_MSW_TOPLEVEL_H_