guarding agains NULL

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

diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index f544bf99def01ce3c220775a7c104349e839e75c..58c8b19dc2314f8e7410b9f52838f7d65b7f34a3 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:
 // 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);
     }
 
         (void)Create(parent, id, title, pos, size, style, name);
     }
 

+    virtual ~wxTopLevelWindowMac();
+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,


@@ -43,15 +45,12 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 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 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);


@@ -63,6 +62,9 @@ public:
     virtual bool IsIconized() const;
     virtual void Restore();
 
     virtual bool IsIconized() const;
     virtual void Restore();
 

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

     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
     virtual bool IsFullScreen() const ;
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
     virtual bool IsFullScreen() const ;
 


@@ -71,7 +73,12 @@ public:
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() const;
 
     virtual void SetTitle( const wxString& title);
     virtual wxString GetTitle() 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();