Use wxMenuBar::Attach/Detach() instead of SetInvokingWindow() in wxGTK1.

[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 c106c39ca73af78b8b2ea477f2b9929f6dac33c6..be5d4cee80809d14e8a6640292f27825a1650dbd 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -215,6 +215,7 @@ public :
     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;
@@ -268,12 +269,20 @@ public :
     virtual void        SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 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;
+    
+    // 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
 
@@ -470,7 +479,7 @@ public :
                                     long style,
                                     long extraStyle);
 
-#ifdef wxOSX_USE_NATIVE_COMBOBOX
+#if wxOSX_USE_COCOA
     static wxWidgetImplType*    CreateComboBox( wxWindowMac* wxpeer, 
                                     wxWindowMac* parent, 
                                     wxWindowID id, 
@@ -488,6 +497,7 @@ protected :
     wxWindowMac*        m_wxPeer;
     bool                m_needsFocusRect;
     bool                m_needsFrame;
+    bool                m_shouldSendEvents;
 
     DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
 };
@@ -612,6 +622,31 @@ public :
     virtual wxSize GetBestSize() const { return wxDefaultSize; }
 };
 
+// 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; }
+};
+
 //
 // common interface for buttons
 //
@@ -760,8 +795,17 @@ public :
     
     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 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  ) ;