Add non-vararg wxFileTypeInfo ctor and various setters.

[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 2ea1bd40a7f9961d25ea880ded30b758f632dd4b..d423355b2e2d496c929bb09ae108668e5fcd74cb 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"
 
 #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() ;
 #if wxOSX_USE_COCOA_OR_CARBON
 
 WXDLLIMPEXP_BASE long UMAGetSystemVersion() ;


@@ -92,6 +103,7 @@ class wxNonOwnedWindow;
 
 class wxMacControl;
 class wxWidgetImpl;
 
 class wxMacControl;
 class wxWidgetImpl;

+class wxComboBox;

 class wxNotebook;
 class wxTextCtrl;
 
 class wxNotebook;
 class wxTextCtrl;
 


@@ -204,6 +216,7 @@ public :
     virtual WXWidget    GetWXWidget() const = 0;
 
     virtual void        SetBackgroundColour( const wxColour& col ) = 0;
     virtual WXWidget    GetWXWidget() const = 0;
 
     virtual void        SetBackgroundColour( const wxColour& col ) = 0;

+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) = 0;

 
     // all coordinates in native parent widget relative coordinates
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
 
     // all coordinates in native parent widget relative coordinates
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const = 0;


@@ -258,12 +271,20 @@ public :
 
     virtual void        SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
 
 
     virtual void        SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
 

+    virtual void        SetToolTip(wxToolTip* WXUNUSED(tooltip)) { }
+

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

+    // Mechanism used to keep track of whether a change should send an event
+    // Do SendEvents(false) when starting actions that would trigger programmatic events
+    // and SendEvents(true) at the end of the block.
+    virtual void        SendEvents(bool shouldSendEvents) { m_shouldSendEvents = shouldSendEvents; }
+    virtual bool        ShouldSendEvents() { return m_shouldSendEvents; }
+

     // static methods for associating native controls and their implementations
 
     static wxWidgetImpl*
     // static methods for associating native controls and their implementations
 
     static wxWidgetImpl*


@@ -459,6 +480,17 @@ public :
                                     long style,
                                     long extraStyle);
 
                                     long style,
                                     long extraStyle);
 

+#if wxOSX_USE_COCOA
+    static wxWidgetImplType*    CreateComboBox( wxComboBox* wxpeer,
+                                    wxWindowMac* parent,
+                                    wxWindowID id,
+                                    wxMenu* menu,
+                                    const wxPoint& pos,
+                                    const wxSize& size,
+                                    long style,
+                                    long extraStyle);
+#endif
+

     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :
     // converts from Toplevel-Content relative to local
     static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
 protected :


@@ -466,6 +498,7 @@ protected :
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;

+    bool                m_shouldSendEvents;

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


@@ -531,6 +564,8 @@ public:
     // accessing content
 
     virtual unsigned int    ListGetCount() const = 0;
     // accessing content
 
     virtual unsigned int    ListGetCount() const = 0;

+
+    virtual int             DoListHitTest( const wxPoint& inpoint ) const = 0;

 };
 
 //
 };
 
 //


@@ -538,16 +573,23 @@ public:
 //
 
 class WXDLLIMPEXP_FWD_CORE wxTextAttr;
 //
 
 class WXDLLIMPEXP_FWD_CORE wxTextAttr;

+class WXDLLIMPEXP_FWD_CORE wxTextEntry;

 
 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 
 {
 public :
 
 // common interface for all implementations
 class WXDLLIMPEXP_CORE wxTextWidgetImpl
 
 {
 public :

-    wxTextWidgetImpl() {}
+    // Any widgets implementing this interface must be associated with a
+    // wxTextEntry so instead of requiring the derived classes to implement
+    // another (pure) virtual function, just take the pointer to this entry in
+    // our ctor and implement GetTextEntry() ourselves.
+    wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {}

 
     virtual ~wxTextWidgetImpl() {}
 
 
     virtual ~wxTextWidgetImpl() {}
 

+    wxTextEntry *GetTextEntry() const { return m_entry; }
+

     virtual bool CanFocus() const { return true; }
 
     virtual wxString GetStringValue() const = 0 ;
     virtual bool CanFocus() const { return true; }
 
     virtual wxString GetStringValue() const = 0 ;


@@ -556,6 +598,7 @@ public :
     virtual void GetSelection( long* from, long* to ) const = 0 ;
     virtual void WriteText( const wxString& str ) = 0 ;
 
     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() ;
     virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
     virtual void Copy() ;
     virtual void Cut() ;


@@ -585,6 +628,38 @@ public :
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }
     virtual int GetLineLength(long lineNo) const ;
     virtual wxString GetLineText(long lineNo) const ;
     virtual void CheckSpelling(bool WXUNUSED(check)) { }

+
+    virtual wxSize GetBestSize() const { return wxDefaultSize; }
+
+private:
+    wxTextEntry * const m_entry;
+
+    wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl);
+};
+
+// common interface for all implementations
+class WXDLLIMPEXP_CORE wxComboWidgetImpl
+
+{
+public :
+    wxComboWidgetImpl() {}
+
+    virtual ~wxComboWidgetImpl() {}
+
+    virtual int GetSelectedItem() const { return -1; };
+    virtual void SetSelectedItem(int WXUNUSED(item)) {};
+
+    virtual int GetNumberOfItems() const { return -1; };
+
+    virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
+
+    virtual void RemoveItem(int WXUNUSED(pos)) {}
+
+    virtual void Clear() {}
+
+    virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
+
+    virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; }

 };
 
 //
 };
 
 //


@@ -596,7 +671,7 @@ class wxButtonImpl
     public :
     wxButtonImpl(){}
     virtual ~wxButtonImpl(){}
     public :
     wxButtonImpl(){}
     virtual ~wxButtonImpl(){}

-    
+

     virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
 } ;
 
     virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
 } ;
 


@@ -639,7 +714,7 @@ public :
     {
     }
 
     {
     }
 

-    virtual void Destroy()
+    virtual void WillBeDestroyed()

     {
     }
 
     {
     }
 


@@ -685,12 +760,16 @@ public :
     {
     }
 
     {
     }
 

+    virtual void SetWindowStyleFlag( long WXUNUSED(style) )
+    {
+    }
+

     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
     {
         return false ;
     }
 
     virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
     {
         return false ;
     }
 

-    bool CanSetTransparent()
+    virtual bool CanSetTransparent()

     {
         return false;
     }
     {
         return false;
     }


@@ -717,6 +796,8 @@ public :
 
     virtual bool IsFullScreen() const= 0;
 
 
     virtual bool IsFullScreen() const= 0;
 

+    virtual void ShowWithoutActivating() { Show(true); }
+

     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;
     virtual bool ShowFullScreen(bool show, long style)= 0;
 
     virtual void RequestUserAttention(int flags) = 0;


@@ -725,13 +806,27 @@ public :
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
 
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
 

+    virtual bool IsActive() = 0;
+

     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
 

+    static wxNonOwnedWindowImpl*
+                FindFromWXWindow(WXWindow window);
+
+    static void  RemoveAssociations( wxNonOwnedWindowImpl* impl);
+
+    static void  Associate( WXWindow window, wxNonOwnedWindowImpl *impl );
+

     // static creation methods, must be implemented by all toolkits
 
     // static creation methods, must be implemented by all toolkits
 

+    static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ;
+

     static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name  ) ;
 
     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;
     DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)
 protected :
     wxNonOwnedWindow*   m_wxPeer;
     DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)