projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed const operator[]s (should fix 1162115)
[wxWidgets.git]
/
include
/
wx
/
univ
/
toplevel.h
diff --git
a/include/wx/univ/toplevel.h
b/include/wx/univ/toplevel.h
index 13713dd1c0204891a0440113c713cb613b987568..70f04446c3c24bf6ca8a63bf6ba84f40bf0a6d71 100644
(file)
--- a/
include/wx/univ/toplevel.h
+++ b/
include/wx/univ/toplevel.h
@@
-3,7
+3,7
@@
// Purpose: Top level window, abstraction of wxFrame and wxDialog
// Author: Vaclav Slavik
// Id: $Id$
// Purpose: Top level window, abstraction of wxFrame and wxDialog
// Author: Vaclav Slavik
// Id: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001
-2002
SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-11,12
+11,13
@@
#ifndef __WX_UNIV_TOPLEVEL_H__
#define __WX_UNIV_TOPLEVEL_H__
#ifndef __WX_UNIV_TOPLEVEL_H__
#define __WX_UNIV_TOPLEVEL_H__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "univtoplevel.h"
#endif
#include "wx/univ/inpcons.h"
#include "wx/univ/inphand.h"
#pragma interface "univtoplevel.h"
#endif
#include "wx/univ/inpcons.h"
#include "wx/univ/inphand.h"
+#include "wx/icon.h"
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-35,7
+36,7
@@
enum
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
wxTOPLEVEL_BUTTON_ICONIZE = 0x04000000,
wxTOPLEVEL_BUTTON_RESTORE = 0x08000000,
wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
wxTOPLEVEL_BUTTON_ICONIZE = 0x04000000,
wxTOPLEVEL_BUTTON_RESTORE = 0x08000000,
- wxTOPLEVEL_BUTTON_HELP = 0x10000000
,
+ wxTOPLEVEL_BUTTON_HELP = 0x10000000
};
// frame hit test return values:
};
// frame hit test return values:
@@
-123,7
+124,8
@@
public:
virtual wxPoint GetClientAreaOrigin() const;
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
virtual wxPoint GetClientAreaOrigin() const;
virtual void DoGetClientSize(int *width, int *height) const;
virtual void DoSetClientSize(int width, int height);
- virtual void SetIcon(const wxIcon& icon);
+ virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
+ virtual void SetIcons(const wxIconBundle& icons);
// implementation from now on
// --------------------------
// implementation from now on
// --------------------------
@@
-154,11
+156,12
@@
protected:
void Init();
void RefreshTitleBar();
void Init();
void RefreshTitleBar();
- void OnNcPaint(wxPaintEvent& event);
+ void OnNcPaint(wxNcPaintEvent& event);
+ void OnSystemMenu(wxCommandEvent& event);
- //
TRUE
if wxTLW should render decorations (aka titlebar) itself
+ //
true
if wxTLW should render decorations (aka titlebar) itself
static int ms_drawDecorations;
static int ms_drawDecorations;
- //
TRUE
if wxTLW can be iconized
+ //
true
if wxTLW can be iconized
static int ms_canIconize;
// true for currently active frame
bool m_isActive:1;
static int ms_canIconize;
// true for currently active frame
bool m_isActive:1;