projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxUSE_CONSOLE_EVENTLOOP around wxConsoleEventLoop
[wxWidgets.git]
/
include
/
wx
/
toplevel.h
diff --git
a/include/wx/toplevel.h
b/include/wx/toplevel.h
index 268ecbd4ad121a04f5c3501f4c59c0f3b375e4fb..1a20a0465885de66cc67d141837fa195c7f49ea3 100644
(file)
--- a/
include/wx/toplevel.h
+++ b/
include/wx/toplevel.h
@@
-20,11
+20,12
@@
#include "wx/nonownedwnd.h"
#include "wx/iconbndl.h"
#include "wx/nonownedwnd.h"
#include "wx/iconbndl.h"
+#include "wx/containr.h"
// the default names for various classes
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
// the default names for various classes
extern WXDLLEXPORT_DATA(const wxChar) wxFrameNameStr[];
-class WXDLL
EXPORT
wxTopLevelWindowBase;
+class WXDLL
IMPEXP_FWD_CORE
wxTopLevelWindowBase;
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
// constants
@@
-206,9
+207,6
@@
public:
// reverts to the "permanent" default as soon as this temporary default
// item loses focus
// reverts to the "permanent" default as soon as this temporary default
// item loses focus
- // used to reset default if pointing to removed child
- virtual void RemoveChild(wxWindowBase *child);
-
// get the default item, temporary or permanent
wxWindow *GetDefaultItem() const
{ return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
// get the default item, temporary or permanent
wxWindow *GetDefaultItem() const
{ return m_winTmpDefault ? m_winTmpDefault : m_winDefault; }
@@
-252,11
+250,6
@@
public:
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
virtual void SetMinSize(const wxSize& minSize);
virtual void SetMaxSize(const wxSize& maxSize);
- // set size hints for "window manager"
- virtual void DoSetSizeHints( int minW, int minH,
- int maxW = wxDefaultCoord, int maxH = wxDefaultCoord,
- int incW = wxDefaultCoord, int incH = wxDefaultCoord );
-
protected:
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area
protected:
// the frame client to screen translation should take account of the
// toolbar which may shift the origin of the client area
@@
-311,6
+304,7
@@
protected:
DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxTopLevelWindowBase)
DECLARE_EVENT_TABLE()
+ WX_DECLARE_CONTROL_CONTAINER();
};
};