various cleanups

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index a77b61aa777c9aa3b414a9156245986f3b636389..97ccb2b81d5d7fb347498859bfdba4842f03c65c 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -262,6 +262,10 @@ wxCOCOA:
 
 - Added UNICODE layer for OSX so that you can build wxWidgets in UNICODE mode in OSX 10.2 (and possibly lower) with wxMAC and wxCOCOA (RN)
 - Fixed so that wxCOCOA runs in 10.2 (and possibly lower) (RN)
 
 - Added UNICODE layer for OSX so that you can build wxWidgets in UNICODE mode in OSX 10.2 (and possibly lower) with wxMAC and wxCOCOA (RN)
 - Fixed so that wxCOCOA runs in 10.2 (and possibly lower) (RN)

+- Tooltips now supported - Enable and SetDelay not implemented (RN)
+- wxSound now supported (RN)
+- wxDisplay now supported (RN)
+- Cursors (hopefully) now supported (RN)

 
 wxMac:
 
 
 wxMac:
 

diff --git a/include/wx/cocoa/tooltip.h b/include/wx/cocoa/tooltip.h
index 403445363b3e6c453d5f5c37f14d78a2e61e760f..42433e2398bb8fe062b7d7c3d378da5b913be510 100644 (file)
--- a/include/wx/cocoa/tooltip.h
+++ b/include/wx/cocoa/tooltip.h
@@ -11,29 +11,32 @@
 
 #include "wx/object.h"
 
 
 #include "wx/object.h"
 

+class wxWindow;
+

 class wxToolTip : public wxObject
 {
 public:
     // ctor & dtor
 class wxToolTip : public wxObject
 {
 public:
     // ctor & dtor

-    wxToolTip(const wxString &tip) : m_text(tip), m_window(0) {}
-    virtual ~wxToolTip() {}
+    wxToolTip(const wxString &tip);
+    virtual ~wxToolTip();

 
     // accessors
         // tip text
 
     // accessors
         // tip text

-    void SetTip(const wxString& tip)   { m_text = tip; }
-    const wxString& GetTip() const { return m_text; }
+    void SetTip(const wxString& tip);
+    const wxString& GetTip() const;

 
         // the window we're associated with
 
         // the window we're associated with

-    wxWindow *GetWindow() const { return m_window; }
+    wxWindow *GetWindow() const;

 
     // controlling tooltip behaviour: globally change tooltip parameters
         // enable or disable the tooltips globally
 
     // controlling tooltip behaviour: globally change tooltip parameters
         // enable or disable the tooltips globally

-    static void Enable(bool flag) {}
+    static void Enable(bool flag);

         // set the delay after which the tooltip appears
         // set the delay after which the tooltip appears

-    static void SetDelay(long milliseconds) {}
+    static void SetDelay(long milliseconds);

 
 private:
 
 private:

-    void SetWindow(wxWindow* window) {m_window = window;}
+    void SetWindow(wxWindow* window);
+

     friend class wxWindow;
 
     wxString  m_text;           // tooltip text
     friend class wxWindow;
 
     wxString  m_text;           // tooltip text

diff --git a/src/cocoa/display.mm b/src/cocoa/display.mm
index 5bfc26bef7e8fe8057b435c71658b4095ca5d8a9..e54ed5c1072928428a292d71533fd41258cbecb5 100644 (file)
--- a/src/cocoa/display.mm
+++ b/src/cocoa/display.mm
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/cocoa/display.cpp
+// Name:        src/cocoa/display.mm

 // Purpose:     Cocoa implementation of wxDisplay class
 // Author:      Ryan Norton
 // Modified by: 
 // Created:     2004-10-03
 // RCS-ID:      $Id$
 // Purpose:     Cocoa implementation of wxDisplay class
 // Author:      Ryan Norton
 // Modified by: 
 // Created:     2004-10-03
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWidgets team
+// Copyright:   (c) Ryan Norton

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/cocoa/tooltip.mm b/src/cocoa/tooltip.mm
index 8b137891791fe96927ad78e64b0aad7bded08bdc..fd2907bbdc5e37e3c789f16fcf02df3065152246 100644 (file)
--- a/src/cocoa/tooltip.mm
+++ b/src/cocoa/tooltip.mm
@@ -1 +1,92 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        src/cocoa/tooltip.mm
+// Purpose:     Cocoa tooltips
+// Author:      Ryan Norton
+// Modified by: 
+// Created:     2004-10-03
+// RCS-ID:      $Id$
+// Copyright:   (c) Ryan Norton
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+
+#include "wx/defs.h"
+
+#if wxUSE_TOOLTIPS
+
+#include "wx/window.h"
+#include "wx/tooltip.h"
+
+#include "wx/cocoa/autorelease.h"
+#include "wx/cocoa/string.h"
+
+#import <AppKit/NSView.h>
+
+//-----------------------------------------------------------------------------
+// wxToolTip
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+
+wxToolTip::wxToolTip(const wxString &tip) : 
+    m_text(tip), m_window(0) 
+{
+}
+
+wxToolTip::~wxToolTip() 
+{
+}
+
+void wxToolTip::SetTip(const wxString& tip)
+{ 
+    m_text = tip; 
+}
+
+const wxString& wxToolTip::GetTip() const 
+{ 
+    return m_text; 
+}
+
+// the window we're associated with
+wxWindow *wxToolTip::GetWindow() const 
+{ 
+    return m_window; 
+}
+
+// enable or disable the tooltips globally
+//static 
+    void wxToolTip::Enable(bool flag) 
+{
+    //TODO
+    wxFAIL_MSG(wxT("Not implemented"));
+}
+
+// set the delay after which the tooltip appears
+//static
+    void SetDelay(long milliseconds) 
+{
+    //TODO
+    wxFAIL_MSG(wxT("Not implemented"));
+}
+
+void wxToolTip::SetWindow(wxWindow* window) 
+{
+    wxAutoNSAutoreleasePool pool;
+
+    m_window = window;
+    
+    //set the tooltip - empty string means remove
+    if (m_text.IsEmpty())
+        [m_window->GetNSView() setToolTip:nil];        
+    else
+        [m_window->GetNSView() setToolTip:wxNSStringWithWxString(m_text)];    
+}
+
+#endif //wxUSE_TOOLTIPS

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 96e4777abe017daf5064a94c402da153c22f89c4..0395a461c1ed5764b069a02a88c670775cb9a368 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -25,7 +25,6 @@
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <Foundation/NSException.h>
 #import <AppKit/NSColor.h>
 #import <AppKit/NSClipView.h>
 #import <Foundation/NSException.h>

-#import <Foundation/NSString.h>

 
 #include <objc/objc-runtime.h>
 
 
 #include <objc/objc-runtime.h>
 


@@ -611,22 +610,20 @@ void wxWindowCocoa::DoSetSize(int x, int y, int width, int height, int sizeFlags
     DoMoveWindow(x,y,width,height);
 }
 
     DoMoveWindow(x,y,width,height);
 }
 

-//We should really get rid of wxToolTip :)
-IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject)
+#if wxUSE_TOOLTIPS

 
 void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
 {
     wxWindowBase::DoSetToolTip(tip);
 
 
 void wxWindowCocoa::DoSetToolTip( wxToolTip *tip )
 {
     wxWindowBase::DoSetToolTip(tip);
 

-    wxAutoNSAutoreleasePool pool;
-

     if ( m_tooltip )
     {
         m_tooltip->SetWindow((wxWindow *)this);
     if ( m_tooltip )
     {
         m_tooltip->SetWindow((wxWindow *)this);

-        [GetNSView() setToolTip:wxNSStringWithWxString(m_tooltip->GetTip())];

     }
 }
 
     }
 }
 

+#endif
+

 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
     wxAutoNSAutoreleasePool pool;
 void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
 {
     wxAutoNSAutoreleasePool pool;