compilation fixes for wxGTK1 after wxTextEntry changes (unit test still fails, Replac...

[wxWidgets.git] / include / wx / cocoa / toolbar.h

diff --git a/include/wx/cocoa/toolbar.h b/include/wx/cocoa/toolbar.h
index d8ccd336b920b1d65f785b3c5924db80ffef05cd..29b4b632bf021553182c4b028b5a436394803994 100644 (file)
--- a/include/wx/cocoa/toolbar.h
+++ b/include/wx/cocoa/toolbar.h
@@ -17,10 +17,15 @@
 // ========================================================================
 // wxToolBar
 // ========================================================================
 // ========================================================================
 // wxToolBar
 // ========================================================================

+#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64)
+typedef struct CGPoint NSPoint;
+#else

 typedef struct _NSPoint NSPoint;
 typedef struct _NSPoint NSPoint;

+#endif
+

 class wxToolBarTool;
 
 class wxToolBarTool;
 

-class wxToolBar : public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase

 {
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 // ------------------------------------------------------------------------
 {
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 // ------------------------------------------------------------------------


@@ -57,10 +62,12 @@ protected:
 // Cocoa
 // ------------------------------------------------------------------------
 protected:
 // Cocoa
 // ------------------------------------------------------------------------
 protected:

+    virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent);

     virtual bool Cocoa_drawRect(const NSRect &rect);
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent);
     wxToolBarTool *CocoaFindToolForPosition(const NSPoint& pos) const;
     virtual bool Cocoa_drawRect(const NSRect &rect);
     virtual bool Cocoa_mouseDown(WX_NSEvent theEvent);
     virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent);
     wxToolBarTool *CocoaFindToolForPosition(const NSPoint& pos) const;

+    void CocoaToolClickEnded();

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -101,7 +108,8 @@ protected:
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);
                                           wxObject *clientData,
                                           const wxString& shortHelpString,
                                           const wxString& longHelpString);

-    virtual wxToolBarToolBase *CreateTool(wxControl *control);
+    virtual wxToolBarToolBase *CreateTool(wxControl *control,
+                                          const wxString& label);

 
     wxSize m_bestSize;
     wxFrame *m_owningFrame;
 
     wxSize m_bestSize;
     wxFrame *m_owningFrame;