fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/hyperlink.h b/include/wx/generic/hyperlink.h
index 93a086f565ecc98b6e7c3e25c78146f9605a616b..9146ba8ada126f20b044524fd51f5f48876b3fe4 100644 (file)
--- a/include/wx/generic/hyperlink.h
+++ b/include/wx/generic/hyperlink.h
@@ -9,12 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GENERICHYPERLINKCTRLH__
-#define __GENERICHYPERLINKCTRLH__
-
-#include "wx/defs.h"
-#include "wx/control.h"
-
+#ifndef _WX_GENERICHYPERLINKCTRL_H_
+#define _WX_GENERICHYPERLINKCTRL_H_

 
 // ----------------------------------------------------------------------------
 // wxGenericHyperlinkCtrl
 
 // ----------------------------------------------------------------------------
 // wxGenericHyperlinkCtrl


@@ -24,7 +20,7 @@ class WXDLLIMPEXP_ADV wxGenericHyperlinkCtrl : public wxHyperlinkCtrlBase
 {
 public:
     // Default constructor (for two-step construction).
 {
 public:
     // Default constructor (for two-step construction).

-    wxGenericHyperlinkCtrl() { }
+    wxGenericHyperlinkCtrl() { Init(); }

 
     // Constructor.
     wxGenericHyperlinkCtrl(wxWindow *parent,
 
     // Constructor.
     wxGenericHyperlinkCtrl(wxWindow *parent,


@@ -35,7 +31,8 @@ public:
                             long style = wxHL_DEFAULT_STYLE,
                             const wxString& name = wxHyperlinkCtrlNameStr)
     {
                             long style = wxHL_DEFAULT_STYLE,
                             const wxString& name = wxHyperlinkCtrlNameStr)
     {

-        (void)Create(parent, id, label, url, pos, size, style, name);
+        Init();
+        (void) Create(parent, id, label, url, pos, size, style, name);

     }
 
     // Creation function (for two-step construction).
     }
 
     // Creation function (for two-step construction).


@@ -69,6 +66,10 @@ public:
 
 
 protected:
 
 
 protected:

+    // Helper used by this class itself and native MSW implementation that
+    // connects OnRightUp() and OnPopUpCopy() handlers.
+    void ConnectMenuHandlers();
+

     // event handlers
 
     // Renders the hyperlink.
     // event handlers
 
     // Renders the hyperlink.


@@ -100,20 +101,19 @@ protected:
     // handles "Copy URL" menuitem
     void OnPopUpCopy(wxCommandEvent& event);
 
     // handles "Copy URL" menuitem
     void OnPopUpCopy(wxCommandEvent& event);
 

-    // Refreshes the control to update label's position if necessary
-    void OnSize(wxSizeEvent& event);
-
-

     // overridden base class virtuals
 
     // Returns the best size for the window, which is the size needed
     // to display the text label.
     // overridden base class virtuals
 
     // Returns the best size for the window, which is the size needed
     // to display the text label.

-    virtual wxSize DoGetBestSize() const;
+    virtual wxSize DoGetBestClientSize() const;

 
     // creates a context menu with "Copy URL" menuitem
     virtual void DoContextMenu(const wxPoint &);
 
 private:
 
     // creates a context menu with "Copy URL" menuitem
     virtual void DoContextMenu(const wxPoint &);
 
 private:

+    // Common part of all ctors.
+    void Init();
+

     // URL associated with the link. This is transmitted inside
     // the HyperlinkEvent fired when the user clicks on the label.
     wxString m_url;
     // URL associated with the link. This is transmitted inside
     // the HyperlinkEvent fired when the user clicks on the label.
     wxString m_url;


@@ -134,9 +134,6 @@ private:
     // True if a click is in progress (left button down) and the click
     // originated inside the label's bounding box.
     bool m_clicking;
     // True if a click is in progress (left button down) and the click
     // originated inside the label's bounding box.
     bool m_clicking;

-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGenericHyperlinkCtrl)

 };
 
 };
 

-#endif // __GENERICHYPERLINKCTRLH__
+#endif // _WX_GENERICHYPERLINKCTRL_H_