projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added #if wxUSE_STACKWALKER. Fixes compilation of OS X shared libraries.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
toplevel.h
diff --git
a/include/wx/gtk/toplevel.h
b/include/wx/gtk/toplevel.h
index f6cf4037548efb4860022810354f32242d5800e3..d4464c2ec9f8d930880599b6335f18a6bf69c995 100644
(file)
--- a/
include/wx/gtk/toplevel.h
+++ b/
include/wx/gtk/toplevel.h
@@
-11,7
+11,7
@@
#ifndef __GTKTOPLEVELH__
#define __GTKTOPLEVELH__
#ifndef __GTKTOPLEVELH__
#define __GTKTOPLEVELH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "toplevel.h"
#endif
#pragma interface "toplevel.h"
#endif
@@
-54,16
+54,29
@@
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 bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; };
virtual void Restore();
virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
virtual bool IsFullScreen() const { return m_fsIsShowing; };
+ virtual bool SetShape(const wxRegion& region);
+
virtual bool Show(bool show = TRUE);
virtual bool Show(bool show = TRUE);
+ virtual void Raise();
+
+ virtual bool IsActive();
+
virtual void SetTitle( const wxString &title );
virtual wxString GetTitle() const { return m_title; }
virtual void SetTitle( const wxString &title );
virtual wxString GetTitle() const { return m_title; }
+ // Experimental, to allow help windows to be
+ // viewable from within modal dialogs
+ virtual void AddGrab();
+ virtual void RemoveGrab();
+ virtual bool IsGrabbed() const { return m_grabbed; }
+
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
@@
-85,10
+98,14
@@
public:
bool m_insertInClientArea; /* not from within OnCreateXXX */
bool m_fsIsShowing; /* full screen */
bool m_insertInClientArea; /* not from within OnCreateXXX */
bool m_fsIsShowing; /* full screen */
- long m_fsSave
Style
;
+ long m_fsSave
GdkFunc, m_fsSaveGdkDecor
;
long m_fsSaveFlag;
wxRect m_fsSaveFrame;
long m_fsSaveFlag;
wxRect m_fsSaveFrame;
+ // m_windowStyle translated to GDK's terms
+ long m_gdkFunc,
+ m_gdkDecor;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-103,6
+120,9
@@
protected:
// is the frame currently iconized?
bool m_isIconized;
// is the frame currently iconized?
bool m_isIconized;
+ // is the frame currently grabbed explicitly
+ // by the application?
+ bool m_grabbed;
};
#endif // __GTKTOPLEVELH__
};
#endif // __GTKTOPLEVELH__