Make wxDragImage ctors taking hot spot point really deprecated in wxMSW.

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 013e081df60b00a51e7b30e2a23324d340779440..f056ed31025f6af60e37eb99f768199f57b51d51 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -16,6 +16,7 @@
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {
 
 class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase
 {

+    typedef wxTopLevelWindowBase base_type;

 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }
 public:
     // construction
     wxTopLevelWindowGTK() { Init(); }


@@ -54,9 +55,7 @@ public:
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
 
     virtual void ShowWithoutActivating();
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);

-    virtual bool IsFullScreen() const { return m_fsIsShowing; };
-
-    virtual bool SetShape(const wxRegion& region);
+    virtual bool IsFullScreen() const { return m_fsIsShowing; }

 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 
 
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
 


@@ -71,6 +70,10 @@ public:
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 
     virtual void SetTitle( const wxString &title );
     virtual wxString GetTitle() const { return m_title; }
 

+    virtual void SetLabel(const wxString& label) { SetTitle( label ); }
+    virtual wxString GetLabel() const            { return GetTitle(); }
+
+

     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 


@@ -90,6 +93,8 @@ public:
     // GTK callbacks
     virtual void OnInternalIdle();
 
     // GTK callbacks
     virtual void OnInternalIdle();
 

+    virtual void GTKHandleRealized();
+

     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 
     // do *not* call this to iconize the frame, this is a private function!
     void SetIconizeState(bool iconic);
 


@@ -106,12 +111,11 @@ public:
     // size of WM decorations
     wxSize m_decorSize;
 
     // size of WM decorations
     wxSize m_decorSize;
 

-    // shape of the frame
-    wxRegion m_shape;
-

     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;
     // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and
     // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle.
     int m_urgency_hint;

+    // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling
+    unsigned m_netFrameExtentsTimerId;

 
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;
 
     // return the size of the window without WM decorations
     void GTKDoGetSize(int *width, int *height) const;