Instead of just deleting m_popupInterface, call Destroy() of its wxWindow-based popup...

[wxWidgets.git] / include / wx / osx / cursor.h

diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index cf00e0c8e477f86521b671782dd20072479a3390..66516c41130c718c78bf01dea1be0c3c505eb4a5 100644 (file)
--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -21,7 +21,6 @@ public:
     wxCursor();
 
     wxCursor(const wxImage & image) ;
     wxCursor();
 
     wxCursor(const wxImage & image) ;

-    wxCursor(const char* const* bits);

     wxCursor(const wxString& name,
              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);
     wxCursor(const wxString& name,
              wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
              int hotSpotX = 0, int hotSpotY = 0);


@@ -32,19 +31,18 @@ public:
 #endif
     virtual ~wxCursor();
 
 #endif
     virtual ~wxCursor();
 

-    bool CreateFromXpm(const char* const* bits);
-

     void MacInstall() const ;
 
     void SetHCURSOR(WXHCURSOR cursor);
     WXHCURSOR GetHCURSOR() const;
 
     void MacInstall() const ;
 
     void SetHCURSOR(WXHCURSOR cursor);
     WXHCURSOR GetHCURSOR() const;
 

-private:
-    void InitFromStock(wxStockCursor);
-
+protected:

     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 
     virtual wxGDIRefData *CreateGDIRefData() const;
     virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
 

+private:
+    void InitFromStock(wxStockCursor);
+

     void CreateFromImage(const wxImage & image) ;
 
     DECLARE_DYNAMIC_CLASS(wxCursor)
     void CreateFromImage(const wxImage & image) ;
 
     DECLARE_DYNAMIC_CLASS(wxCursor)