made declaration of WXDLL_ENTRY_FUNCTION match it definition

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 4c99fc95e2d82312106e56778e699e0ca8c1b5ff..ef740f21d750cf431b4de493b29de9178cec6c02 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -28,14 +28,14 @@ enum
     wxTOPLEVEL_ACTIVE          = 0x00000001,
     wxTOPLEVEL_MAXIMIZED       = 0x00000002,
     wxTOPLEVEL_TITLEBAR        = 0x00000004,
-    wxTOPLEVEL_ICON            = 0x00000009,
+    wxTOPLEVEL_ICON            = 0x00000008,
     wxTOPLEVEL_RESIZEABLE      = 0x00000010,
     wxTOPLEVEL_BORDER          = 0x00000020,
     wxTOPLEVEL_BUTTON_CLOSE    = 0x01000000,
     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:
@@ -50,11 +50,11 @@ enum
     wxHT_TOPLEVEL_BORDER_S        = 0x00000020,
     wxHT_TOPLEVEL_BORDER_E        = 0x00000040,
     wxHT_TOPLEVEL_BORDER_W        = 0x00000080,
-    wxHT_TOPLEVEL_ANY_BORDER      = 0x000000F0,
     wxHT_TOPLEVEL_BORDER_NE       = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_E,
     wxHT_TOPLEVEL_BORDER_SE       = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_E,
     wxHT_TOPLEVEL_BORDER_NW       = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_W,
     wxHT_TOPLEVEL_BORDER_SW       = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_W,
+    wxHT_TOPLEVEL_ANY_BORDER      = 0x000000F0,
 
     wxHT_TOPLEVEL_BUTTON_CLOSE    = /*0x01000000*/ wxTOPLEVEL_BUTTON_CLOSE,
     wxHT_TOPLEVEL_BUTTON_MAXIMIZE = /*0x02000000*/ wxTOPLEVEL_BUTTON_MAXIMIZE,
@@ -115,14 +115,15 @@ public:
 
     // implementation from now on
     // --------------------------
-    
+
     // tests for frame's part at given point
     long HitTest(const wxPoint& pt) const;
 
-protected:
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
+
+protected:
     // handle titlebar button click event
     virtual void ClickTitleBarButton(long button);
 
@@ -133,7 +134,7 @@ protected:
 
     // common part of all ctors
     void Init();
-    
+
     void RefreshTitleBar();
     void OnNcPaint(wxPaintEvent& event);
 
@@ -172,6 +173,8 @@ private:
     wxTopLevelWindow *m_winCapture;
     long              m_winHitTest;
     long              m_winPressed;
+    bool              m_borderCursorOn;
+    wxCursor          m_origCursor;
 };
 
 #endif // __WX_UNIV_TOPLEVEL_H__