more iPhone types

[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 4453c638f72084daef1742bf3cb03d661d32a2df..0c3a9fb3ec9c089747f5d23ff848c05b52c13f9c 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -43,7 +43,7 @@ wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {

-    DECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver)
+    wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver);

 
 public:
     wxMacCGContextStateSaver( CGContextRef cg )
 
 public:
     wxMacCGContextStateSaver( CGContextRef cg )


@@ -95,12 +95,15 @@ class wxWidgetImpl;
 class wxNotebook;
 class wxTextCtrl;
 
 class wxNotebook;
 class wxTextCtrl;
 

+WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
+

 #if wxOSX_USE_CARBON
 typedef wxMacControl wxWidgetImplType;
 #else
 typedef wxWidgetImpl wxWidgetImplType;
 #endif
 
 #if wxOSX_USE_CARBON
 typedef wxMacControl wxWidgetImplType;
 #else
 typedef wxWidgetImpl wxWidgetImplType;
 #endif
 

+#if wxUSE_MENUS

 class wxMenuItemImpl : public wxObject 
 {
 public :
 class wxMenuItemImpl : public wxObject 
 {
 public :


@@ -130,7 +133,7 @@ public :
 protected :
     wxMenuItem* m_peer;
     
 protected :
     wxMenuItem* m_peer;
     

-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
+    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)

 } ;
 
 class wxMenuImpl : public wxObject 
 } ;
 
 class wxMenuImpl : public wxObject 


@@ -152,14 +155,16 @@ public :
     
     wxMenu* GetWXPeer() { return m_peer ; }
 
     
     wxMenu* GetWXPeer() { return m_peer ; }
 

+    virtual void PopUp( wxWindow *win, int x, int y ) = 0;
+

     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;
     
     static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
     static wxMenuImpl* CreateRootMenu( wxMenu* peer );
 protected :
     wxMenu* m_peer;
     

-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl);
+    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)

 } ;
 } ;

-
+#endif

 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
 
 
 class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject


@@ -200,12 +205,18 @@ public :
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
 
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
 

+    // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin)
+    virtual bool        IsFlipped() const { return true; }
+

     virtual void        SetNeedsDisplay( const wxRect* where = NULL ) = 0;
     virtual bool        GetNeedsDisplay() const = 0;
 
     virtual bool        NeedsFocusRect() const;
     virtual void        SetNeedsFocusRect( bool needs );
 
     virtual void        SetNeedsDisplay( const wxRect* where = NULL ) = 0;
     virtual bool        GetNeedsDisplay() const = 0;
 
     virtual bool        NeedsFocusRect() const;
     virtual void        SetNeedsFocusRect( bool needs );
 

+    virtual bool        NeedsFrame() const;
+    virtual void        SetNeedsFrame( bool needs );
+

     virtual bool        CanFocus() const = 0;
     // return true if successful
     virtual bool        SetFocus() = 0;
     virtual bool        CanFocus() const = 0;
     // return true if successful
     virtual bool        SetFocus() = 0;


@@ -218,15 +229,23 @@ public :
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
 
     virtual void        PerformClick() = 0;
     virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
 

+    virtual void        SetCursor( const wxCursor & cursor ) = 0;
+    virtual void        CaptureMouse() = 0;
+    virtual void        ReleaseMouse() = 0;
+

     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;
     virtual wxInt32     GetValue() const = 0;
     virtual void        SetValue( wxInt32 v ) = 0;

+    virtual wxBitmap    GetBitmap() const = 0;

     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;
     virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;

+    virtual void        SetBitmapPosition( wxDirection dir ) = 0;

     virtual void        SetupTabs( const wxNotebook &notebook ) =0;
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;
     virtual void        Enable( bool enable ) = 0;
     virtual void        SetMinimum( wxInt32 v ) = 0;
     virtual void        SetMaximum( wxInt32 v ) = 0;
     virtual void        SetupTabs( const wxNotebook &notebook ) =0;
     virtual void        GetBestRect( wxRect *r ) const = 0;
     virtual bool        IsEnabled() const = 0;
     virtual void        Enable( bool enable ) = 0;
     virtual void        SetMinimum( wxInt32 v ) = 0;
     virtual void        SetMaximum( wxInt32 v ) = 0;

+    virtual wxInt32     GetMinimum() const = 0;
+    virtual wxInt32     GetMaximum() const = 0;

     virtual void        PulseGauge() = 0;
     virtual void        SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0;
 
     virtual void        PulseGauge() = 0;
     virtual void        SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0;
 


@@ -235,7 +254,20 @@ 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 WXWidget     FindFocus();
+    

     // 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, 


@@ -426,6 +458,7 @@ protected :
     bool                m_isRootControl;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_isRootControl;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;

+    bool                m_needsFrame;

 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };
 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };


@@ -449,7 +482,9 @@ public :
    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;
    virtual void Set( CFStringRef value ) = 0;
     virtual void Set( const wxString& value ) = 0;
     virtual void Set( int value ) = 0;

+    virtual void Check( bool check );

     
     

+    virtual bool IsChecked() const;

     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;
 } ;
     virtual int GetIntValue() const = 0;
     virtual wxString GetStringValue() const = 0;
 } ;


@@ -520,7 +555,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 ) ;
 


@@ -703,7 +738,7 @@ private :
 
 void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );
 
 void wxMacCocoaRelease( void* obj );
 void wxMacCocoaAutorelease( void* obj );

-void wxMacCocoaRetain( void* obj );
+void* wxMacCocoaRetain( void* obj );

 
 
 #endif
 
 
 #endif