Restore correct access to wxGenericStaticText::Set{Font,Label}.

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

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index a011a3d5a9fe66a8e91a52a65c49c55ba939de8d..6f64bc39c1a8d6dbdca5384e97143863decdebcc 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -21,6 +21,17 @@
 #include "wx/osx/core/cfstring.h"
 #include "wx/osx/core/cfdataref.h"
 
+// Define helper macros allowing to insert small snippets of code to be
+// compiled for high enough OS X version only: this shouldn't be abused for
+// anything big but it's handy for e.g. specifying OS X 10.6-only protocols in
+// the Objective C classes declarations when they're not supported under the
+// previous versions
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
+    #define wxOSX_10_6_AND_LATER(x) x
+#else
+    #define wxOSX_10_6_AND_LATER(x)
+#endif
+
 #if wxOSX_USE_COCOA_OR_CARBON
 
 WXDLLIMPEXP_BASE long UMAGetSystemVersion() ;
@@ -556,6 +567,7 @@ public :
     virtual void GetSelection( long* from, long* to ) const = 0 ;
     virtual void WriteText( const wxString& str ) = 0 ;
 
+    virtual bool GetStyle( long position, wxTextAttr& style);
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;
@@ -585,17 +597,19 @@ public :
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }
+    
+    virtual wxSize GetBestSize() const { return wxDefaultSize; }
 };
 
 //
-// common interface bitmapbuttons
+// common interface for buttons
 //
 
-class wxBitmapButtonImpl
+class wxButtonImpl
 {
     public :
-    wxBitmapButtonImpl(){}
-    virtual ~wxBitmapButtonImpl(){}
+    wxButtonImpl(){}
+    virtual ~wxButtonImpl(){}
     
     virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
 } ;
@@ -684,7 +698,11 @@ public :
     virtual void SetExtraStyle( long WXUNUSED(exStyle) )
     {
     }
-
+    
+    virtual void SetWindowStyleFlag( long WXUNUSED(style) )
+    {
+    }
+    
     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
     {
         return false ;
@@ -717,6 +735,8 @@ public :
 
     virtual bool IsFullScreen() const= 0;
 
+    virtual void ShowWithoutActivating() { Show(true); }
+    
     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;
@@ -725,12 +745,17 @@ public :
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
 
+    virtual bool IsActive() = 0;
+    
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 
     // static creation methods, must be implemented by all toolkits
 
     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
+    
+    virtual void SetModified(bool WXUNUSED(modified)) { }
+    virtual bool IsModified() const { return false; }
 
 protected :
     wxNonOwnedWindow*   m_wxPeer;