wxGraphicsRenderer::CreateContextFromImage is not static

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

diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index 1e7f8644634a4fd2fe81f850a3113e14a5cf0d74..bfb7a1a95f7dd9f4c795e1e21c3e54161edad85b 100644 (file)
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/mac/carbon/toplevel.h
+// Name:        wx/osx/toplevel.h
 // Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
 // Author:      Stefan Csomor
 // Modified by:
@@ -35,6 +35,8 @@ public:
         (void)Create(parent, id, title, pos, size, style, name);
     }
 
+    virtual ~wxTopLevelWindowMac();
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -43,15 +45,12 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
-    virtual ~wxTopLevelWindowMac();
+    bool Create(wxWindow *parent, WXWindow nativeWindow);
 
     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);
@@ -62,7 +61,7 @@ public:
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual void Restore();
-    
+
     virtual bool IsActive();
 
     virtual void ShowWithoutActivating();
@@ -75,8 +74,8 @@ public:
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
-    virtual void SetModified(bool modified);
-    virtual bool GetModified() const;
+    virtual void OSXSetModified(bool modified);
+    virtual bool OSXIsModified() const;
 
 protected:
     // common part of all ctors