Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index 675c5af2fcfb5744fd09afcd0aa3a00b4f1078c1..dcde837060d09b9b1340667b0dffa5e177642dfd 100644 (file)
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -44,16 +44,13 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
                 const wxSize& size = wxDefaultSize,
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);

-    
+

     bool Create(wxWindow *parent, WXWindow nativeWindow);
     bool Create(wxWindow *parent, WXWindow nativeWindow);

-    
+

     virtual bool Destroy();
 
     virtual wxPoint GetClientAreaOrigin() const;
 
     virtual bool Destroy();
 
     virtual wxPoint GetClientAreaOrigin() const;
 

-    virtual bool SetShape(const wxRegion& region)
-        { return DoSetShape(region); }
-

     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
     // Attracts the users attention to this window if the application is
     // inactive (should be called when a background event occurs)
     virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);


@@ -64,7 +61,7 @@ public:
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual void Restore();
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual void Restore();

-    
+

     virtual bool IsActive();
 
     virtual void ShowWithoutActivating();
     virtual bool IsActive();
 
     virtual void ShowWithoutActivating();


@@ -77,9 +74,14 @@ public:
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 

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

     virtual void OSXSetModified(bool modified);
     virtual bool OSXIsModified() const;
 
     virtual void OSXSetModified(bool modified);
     virtual bool OSXIsModified() const;
 

+    virtual void SetRepresentedFilename(const wxString& filename);
+

 protected:
     // common part of all ctors
     void Init();
 protected:
     // common part of all ctors
     void Init();