moved wxNotebook::HitTest() to the base book control class; implemented it for wxList...

[wxWidgets.git] / include / wx / univ / toplevel.h

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 7b36af81a4780e08374ee3ea936116b9dc512aec..4cb89dbf36057019dad5e3bc47583ea50a547280 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -4,17 +4,13 @@
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __WX_UNIV_TOPLEVEL_H__
 #define __WX_UNIV_TOPLEVEL_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __WX_UNIV_TOPLEVEL_H__
 #define __WX_UNIV_TOPLEVEL_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univtoplevel.h"
-#endif
-

 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
 #include "wx/icon.h"
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
 #include "wx/icon.h"


@@ -122,8 +118,6 @@ public:
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual wxPoint GetClientAreaOrigin() const;
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     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) { SetIcons( wxIconBundle( icon ) ); }
     virtual void SetIcons(const wxIconBundle& icons);
 
     virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
     virtual void SetIcons(const wxIconBundle& icons);
 


@@ -143,14 +137,15 @@ public:
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 
     virtual int GetMinWidth() const;
     virtual int GetMinHeight() const;
 

-    virtual bool ProvidesBackground() const { return TRUE; }
-    
+    virtual wxWindow *GetInputWindow() const { return wx_const_cast(wxTopLevelWindow*, this); }
+

 protected:
 protected:

+    virtual void DoGetClientSize(int *width, int *height) const;
+    virtual void DoSetClientSize(int width, int height);
+

     // handle titlebar button click event
     virtual void ClickTitleBarButton(long button);
 
     // handle titlebar button click event
     virtual void ClickTitleBarButton(long button);
 

-    virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
-

     // return wxTOPLEVEL_xxx combination based on current state of the frame
     long GetDecorationsStyle() const;
 
     // return wxTOPLEVEL_xxx combination based on current state of the frame
     long GetDecorationsStyle() const;
 


@@ -161,9 +156,9 @@ protected:
     void OnNcPaint(wxNcPaintEvent& event);
     void OnSystemMenu(wxCommandEvent& 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;