don't use wxDELETE unnecessarily

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

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 4cb89dbf36057019dad5e3bc47583ea50a547280..d72d9ac85aee72c4bb633ffea29726007f37e5e8 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -88,7 +88,7 @@ enum
 // wxTopLevelWindow
 //-----------------------------------------------------------------------------
 
 // wxTopLevelWindow
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTopLevelWindow : public wxTopLevelWindowNative,
+class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative,

                                      public wxInputConsumer
 {
 public:
                                      public wxInputConsumer
 {
 public:


@@ -115,10 +115,21 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

+    // wxUniv-specific methods: do [not] use native decorations for this (or
+    // all) window(s)
+    //
+    // notice that this has no effect if the system doesn't support any native
+    // decorations anyhow and that by default native decorations are used
+    //
+    // if UseNativeDecorations() is used, it must be called before Create()
+    static void UseNativeDecorationsByDefault(bool native = true);
+    void UseNativeDecorations(bool native = true);
+    bool IsUsingNativeDecorations() const;
+
+

     // 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 SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }

     virtual void SetIcons(const wxIconBundle& icons);
 
     // implementation from now on
     virtual void SetIcons(const wxIconBundle& icons);
 
     // implementation from now on


@@ -131,13 +142,18 @@ public:
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
 
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

     // move/resize the frame interactively, i.e. let the user do it
     virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE);
 
     // 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;
+    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;


@@ -160,8 +176,11 @@ protected:
     static int ms_drawDecorations;
     // true if wxTLW can be iconized
     static int ms_canIconize;
     static int ms_drawDecorations;
     // true if wxTLW can be iconized
     static int ms_canIconize;

+
+    // true if we're using native decorations
+    bool m_usingNativeDecorations;

     // true for currently active frame
     // true for currently active frame

-    bool m_isActive:1;
+    bool m_isActive;

     // version of icon for titlebar (16x16)
     wxIcon m_titlebarIcon;
     // saved window style in fullscreen mdoe
     // version of icon for titlebar (16x16)
     wxIcon m_titlebarIcon;
     // saved window style in fullscreen mdoe


@@ -174,27 +193,4 @@ protected:
     WX_DECLARE_INPUT_CONSUMER()
 };
 
     WX_DECLARE_INPUT_CONSUMER()
 };
 

-// ----------------------------------------------------------------------------
-// wxStdFrameInputHandler: handles focus, resizing and titlebar buttons clicks
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdFrameInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdFrameInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-
-private:
-    // the window (button) which has capture or NULL and the last hittest result
-    wxTopLevelWindow *m_winCapture;
-    long              m_winHitTest;
-    long              m_winPressed;
-    bool              m_borderCursorOn;
-    wxCursor          m_origCursor;
-};
-

 #endif // __WX_UNIV_TOPLEVEL_H__
 #endif // __WX_UNIV_TOPLEVEL_H__