fixed memory leak introduced by dynamic wxMimeTypesManagerImpl creation (rev. 1.44...

[wxWidgets.git] / include / wx / hyperlink.h

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index 474951d97c62214cb3f7ae37a3685b82022533bf..442c22a01b3edc7b2652fb394589defd90c1127a 100644 (file)
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hyperlink.h
+// Name:        wx/hyperlink.h

 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi
 // Purpose:     Hyperlink control
 // Author:      David Norris <danorris@gmail.com>, Otto Wyss
 // Modified by: Ryan Norton, Francesco Montorsi


@@ -12,10 +12,6 @@
 #ifndef _WX_HYPERLINK_H__
 #define _WX_HYPERLINK_H__
 
 #ifndef _WX_HYPERLINK_H__
 #define _WX_HYPERLINK_H__
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "hyperlink.h"
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_HYPERLINKCTRL
 #include "wx/defs.h"
 
 #if wxUSE_HYPERLINKCTRL


@@ -29,7 +25,7 @@
 #define wxHL_CONTEXTMENU        0x0001
 #define wxHL_DEFAULT_STYLE      wxHL_CONTEXTMENU|wxNO_BORDER
 
 #define wxHL_CONTEXTMENU        0x0001
 #define wxHL_DEFAULT_STYLE      wxHL_CONTEXTMENU|wxNO_BORDER
 

-extern WXDLLEXPORT_DATA(const wxChar) wxHyperlinkCtrlNameStr[];
+extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxHyperlinkCtrlNameStr[];

 
 
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------


@@ -46,7 +42,7 @@ extern WXDLLEXPORT_DATA(const wxChar) wxHyperlinkCtrlNameStr[];
 // just like a wxCommandEvent.
 //
 // Use the EVT_HYPERLINK() to catch link events.
 // just like a wxCommandEvent.
 //
 // Use the EVT_HYPERLINK() to catch link events.

-class WXDLLIMPEXP_CORE wxHyperlinkCtrl : public wxControl
+class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxControl

 {
 public:
     // Default constructor (for two-step construction).
 {
 public:
     // Default constructor (for two-step construction).


@@ -165,14 +161,14 @@ private:
 
 // Declare an event identifier.
 BEGIN_DECLARE_EVENT_TYPES()
 
 // Declare an event identifier.
 BEGIN_DECLARE_EVENT_TYPES()

-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, wxEVT_COMMAND_HYPERLINK, 3700)
+    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_ADV, wxEVT_COMMAND_HYPERLINK, 3700)

 END_DECLARE_EVENT_TYPES()
 
 //
 // An event fired when the user clicks on the label in a hyperlink control.
 // See HyperlinkControl for details.
 //
 END_DECLARE_EVENT_TYPES()
 
 //
 // An event fired when the user clicks on the label in a hyperlink control.
 // See HyperlinkControl for details.
 //

-class WXDLLIMPEXP_CORE wxHyperlinkEvent : public wxCommandEvent
+class WXDLLIMPEXP_ADV wxHyperlinkEvent : public wxCommandEvent

 {
 public:
 
 {
 public:
 


@@ -207,4 +203,3 @@ typedef void (wxEvtHandler::*wxHyperlinkEventFunction)(wxHyperlinkEvent&);
 #endif // wxUSE_HYPERLINKCTRL
 
 #endif // _WX_HYPERLINK_H__
 #endif // wxUSE_HYPERLINKCTRL
 
 #endif // _WX_HYPERLINK_H__

-