fix virtual function hiding for LoadFile(); replace a few more longs with wxBitmapTypes

[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 462e0e882ff142f858d03a2fb2f9248973b51a03..dec77345e54cce44486a94e8cb39ca0d56558098 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -235,7 +235,18 @@ public :
     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;
     // is the clicked event sent AFTER the state already changed, so no additional
     // state changing logic is required from the outside
     virtual bool        ButtonClickDidStateChange() = 0;

+    
+    virtual void        InstallEventHandler( WXWidget control = NULL ) = 0;
+
+    // static methods for associating native controls and their implementations

 
 

+    static wxWidgetImpl* 
+                        FindFromWXWidget(WXWidget control);
+    
+    static void         RemoveAssociations( wxWidgetImpl* impl);
+    
+    static void         Associate( WXWidget control, wxWidgetImpl *impl );
+    

     // static creation methods, must be implemented by all toolkits
     
     static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 
     // static creation methods, must be implemented by all toolkits
     
     static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer, 


@@ -495,6 +506,8 @@ public:
 // interface to be implemented by a textcontrol
 //
 
 // interface to be implemented by a textcontrol
 //
 

+class WXDLLIMPEXP_FWD_CORE wxTextAttr;
+

 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 
 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 


@@ -518,7 +531,7 @@ public :
     virtual void Paste() ;
     virtual bool CanPaste() const ;
     virtual void SetEditable( bool editable ) ;
     virtual void Paste() ;
     virtual bool CanPaste() const ;
     virtual void SetEditable( bool editable ) ;

-    virtual wxTextPos GetLastPosition() const ;
+    virtual long GetLastPosition() const ;

     virtual void Replace( long from, long to, const wxString &str ) ;
     virtual void Remove( long from, long to ) ;
 
     virtual void Replace( long from, long to, const wxString &str ) ;
     virtual void Remove( long from, long to ) ;