Merge wxUIActionSimulator fixes from SOC2010_GUI_TEST branch.

[wxWidgets.git] / include / wx / osx / cocoa / private.h

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index 893aba3ac21f099d6315a5eef4718a6c5325084c..857e98908f5fa1ec1885c32e584370827da463f5 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -101,6 +101,7 @@ public :
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour(const wxColour&);
+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style);
 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);
@@ -264,8 +265,8 @@ public :
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 protected :
-    WX_wxNSWindow         m_macWindow;
-    void *              m_macFullScreenData ;
+    WXWindow        m_macWindow;
+    void *          m_macFullScreenData ;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
 };