Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index a13d5c978b8ec6bc8a03d42572d317d21f20d787..bdfe00b2742eda3590e55116a4582b1cde8a55f6 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        wx/toplevel.h
+// Name:        wx/univ/toplevel.h

 // 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$


@@ -77,12 +77,12 @@ enum
 // the actions supported by this control
 // ----------------------------------------------------------------------------
 
 // the actions supported by this control
 // ----------------------------------------------------------------------------
 

-#define wxACTION_TOPLEVEL_ACTIVATE       _T("activate")   // (de)activate the frame
-#define wxACTION_TOPLEVEL_BUTTON_PRESS   _T("pressbtn")   // press titlebar btn
-#define wxACTION_TOPLEVEL_BUTTON_RELEASE _T("releasebtn") // press titlebar btn
-#define wxACTION_TOPLEVEL_BUTTON_CLICK   _T("clickbtn")   // press titlebar btn
-#define wxACTION_TOPLEVEL_MOVE           _T("move")       // move the frame
-#define wxACTION_TOPLEVEL_RESIZE         _T("resize")     // resize the frame
+#define wxACTION_TOPLEVEL_ACTIVATE       wxT("activate")   // (de)activate the frame
+#define wxACTION_TOPLEVEL_BUTTON_PRESS   wxT("pressbtn")   // press titlebar btn
+#define wxACTION_TOPLEVEL_BUTTON_RELEASE wxT("releasebtn") // press titlebar btn
+#define wxACTION_TOPLEVEL_BUTTON_CLICK   wxT("clickbtn")   // press titlebar btn
+#define wxACTION_TOPLEVEL_MOVE           wxT("move")       // move the frame
+#define wxACTION_TOPLEVEL_RESIZE         wxT("resize")     // resize the frame

 
 //-----------------------------------------------------------------------------
 // wxTopLevelWindow
 
 //-----------------------------------------------------------------------------
 // wxTopLevelWindow


@@ -153,7 +153,7 @@ public:
 
     virtual wxSize GetMinSize() const;
 
 
     virtual wxSize GetMinSize() const;
 

-    virtual wxWindow *GetInputWindow() const { return wx_const_cast(wxTopLevelWindow*, this); }
+    virtual wxWindow *GetInputWindow() const { return const_cast<wxTopLevelWindow*>(this); }

 
 protected:
     virtual void DoGetClientSize(int *width, int *height) const;
 
 protected:
     virtual void DoGetClientSize(int *width, int *height) const;