Revert Cygwin changes

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index bbcf1b24a7b4fe9c274fee5577d566430f73e089..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__
 

-#ifdef __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:


@@ -64,6 +65,18 @@ enum
     wxHT_TOPLEVEL_ANY_BUTTON      =   0x1F000000
 };
 
     wxHT_TOPLEVEL_ANY_BUTTON      =   0x1F000000
 };
 

+// Flags for interactive frame manipulation functions (only in wxUniversal):
+enum
+{
+    wxINTERACTIVE_MOVE           = 0x00000001,
+    wxINTERACTIVE_RESIZE         = 0x00000002,
+    wxINTERACTIVE_RESIZE_S       = 0x00000010,
+    wxINTERACTIVE_RESIZE_N       = 0x00000020,
+    wxINTERACTIVE_RESIZE_W       = 0x00000040,
+    wxINTERACTIVE_RESIZE_E       = 0x00000080,
+    wxINTERACTIVE_WAIT_FOR_INPUT = 0x10000000
+};
+

 // ----------------------------------------------------------------------------
 // the actions supported by this control
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 // ----------------------------------------------------------------------------


@@ -111,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
     // --------------------------


@@ -123,6 +137,12 @@ public:
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
 
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
 

+    // move/resize the frame interactively, i.e. let the user do it
+    virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE);
+
+    virtual int GetMinWidth() const;
+    virtual int GetMinHeight() const;
+

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


@@ -136,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;