fix a few hundreds of harmless unused parameters warnings and a couple of real bugs...

[wxWidgets.git] / include / wx / mac / carbon / toplevel.h

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index b50b7160b649d7595d57a66c07fb0bbab0a78e66..71a5f1937cd1598a6b156ea8a993ad2df0d81d23 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -60,8 +60,6 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;

-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }

     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);


@@ -72,6 +70,7 @@ public:
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 
     virtual bool SetTransparent(wxByte alpha);
     virtual bool CanSetTransparent();
 

+    virtual bool SetBackgroundStyle(wxBackgroundStyle style);

 
     // implementation from now on
     // --------------------------
 
     // implementation from now on
     // --------------------------


@@ -102,6 +101,7 @@ public:
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;
     virtual void MacInstallTopLevelWindowEventHandler() ;
 
     bool MacGetMetalAppearance() const ;

+    bool MacGetUnifiedAppearance() const ;

 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;
 
     void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
     wxUint32 MacGetWindowAttributes() const ;


@@ -138,6 +138,7 @@ private :
     // This is because the ExtraStyle flags get out of sync with the metal appearance and the metal
     // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
     void MacSetMetalAppearance( bool on ) ;
     // This is because the ExtraStyle flags get out of sync with the metal appearance and the metal
     // logic & checks cease to work as expected. To set the metal appearance, use SetExtraStyle.
     void MacSetMetalAppearance( bool on ) ;

+    void MacSetUnifiedAppearance( bool on ) ;

 
     WXEVENTHANDLERREF    m_macEventHandler ;
 
 
     WXEVENTHANDLERREF    m_macEventHandler ;