projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."
[wxWidgets.git]
/
include
/
wx
/
gtk1
/
toplevel.h
diff --git
a/include/wx/gtk1/toplevel.h
b/include/wx/gtk1/toplevel.h
index e95ee0f11c50ece2f0d55a0e55e9c6a1f4473593..3a3042dc97ddf9d7506b4792c45281a67ba034ce 100644
(file)
--- a/
include/wx/gtk1/toplevel.h
+++ b/
include/wx/gtk1/toplevel.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: wx/gtk/toplevel.h
+// Name: wx/gtk
1
/toplevel.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,20
+7,14
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
#ifndef __GTKTOPLEVELH__
#define __GTKTOPLEVELH__
#ifndef __GTKTOPLEVELH__
#define __GTKTOPLEVELH__
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "toplevel.h"
-#endif
-
-
//-----------------------------------------------------------------------------
// wxTopLevelWindowGTK
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxTopLevelWindowGTK
//-----------------------------------------------------------------------------
-class wxTopLevelWindowGTK : public wxTopLevelWindowBase
+class
WXDLLIMPEXP_CORE
wxTopLevelWindowGTK : public wxTopLevelWindowBase
{
public:
// construction
{
public:
// construction
@@
-49,11
+43,10
@@
public:
virtual ~wxTopLevelWindowGTK();
// implement base class pure virtuals
virtual ~wxTopLevelWindowGTK();
// implement base class pure virtuals
- virtual void Maximize(bool maximize =
TRUE
);
+ virtual void Maximize(bool maximize =
true
);
virtual bool IsMaximized() const;
virtual bool IsMaximized() const;
- virtual void Iconize(bool iconize =
TRUE
);
+ virtual void Iconize(bool iconize =
true
);
virtual bool IsIconized() const;
virtual bool IsIconized() const;
- virtual void SetIcon(const wxIcon& icon);
virtual void SetIcons(const wxIconBundle& icons);
virtual void Restore();
virtual void SetIcons(const wxIconBundle& icons);
virtual void Restore();
@@
-62,7
+55,15
@@
public:
virtual bool SetShape(const wxRegion& region);
virtual bool SetShape(const wxRegion& region);
- virtual bool Show(bool show = TRUE);
+ virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
+
+ virtual void SetWindowStyleFlag( long style );
+
+ 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; }
@@
-80,9
+81,6
@@
public:
// from both DoSetSize() and DoSetClientSize()
virtual void DoMoveWindow(int x, int y, int width, int height);
// from both DoSetSize() and DoSetClientSize()
virtual void DoMoveWindow(int x, int y, int width, int height);
- // set the icon for this window
- void DoSetIcon( const wxIcon& icon );
-
// GTK callbacks
virtual void GtkOnSize( int x, int y, int width, int height );
virtual void OnInternalIdle();
// GTK callbacks
virtual void GtkOnSize( int x, int y, int width, int height );
virtual void OnInternalIdle();
@@
-90,7
+88,6
@@
public:
// do *not* call this to iconize the frame, this is a private function!
void SetIconizeState(bool iconic);
// do *not* call this to iconize the frame, this is a private function!
void SetIconizeState(bool iconic);
- wxString m_title;
int m_miniEdge,
m_miniTitle;
GtkWidget *m_mainWidget;
int m_miniEdge,
m_miniTitle;
GtkWidget *m_mainWidget;
@@
-105,6
+102,10
@@
public:
long m_gdkFunc,
m_gdkDecor;
long m_gdkFunc,
m_gdkDecor;
+ // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
+ // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
+ int m_urgency_hint;
+
protected:
// common part of all ctors
void Init();
protected:
// common part of all ctors
void Init();
@@
-117,6
+118,8
@@
protected:
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const;
virtual void DoSetClientSize(int width, int height);
virtual void DoGetClientSize( int *width, int *height ) const;
+ wxString m_title;
+
// is the frame currently iconized?
bool m_isIconized;
// is the frame currently grabbed explicitly
// is the frame currently iconized?
bool m_isIconized;
// is the frame currently grabbed explicitly