X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/258b2ca6819988c73a953bb8c2760b91c78d520c..580ca0a4e10dbd2fb0a144065004394b9d5dcc56:/include/wx/hyperlink.h

diff --git a/include/wx/hyperlink.h b/include/wx/hyperlink.h
index cfbed46e96..4ebe3bc98b 100644
--- a/include/wx/hyperlink.h
+++ b/include/wx/hyperlink.h
@@ -23,7 +23,10 @@
 // ----------------------------------------------------------------------------
 
 #define wxHL_CONTEXTMENU        0x0001
-#define wxHL_DEFAULT_STYLE      wxHL_CONTEXTMENU|wxNO_BORDER
+#define wxHL_ALIGN_LEFT         0x0002
+#define wxHL_ALIGN_RIGHT        0x0004
+#define wxHL_ALIGN_CENTRE       0x0008
+#define wxHL_DEFAULT_STYLE      (wxHL_CONTEXTMENU|wxNO_BORDER|wxHL_ALIGN_CENTRE)
 
 extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxHyperlinkCtrlNameStr[];
 
@@ -96,6 +99,12 @@ protected:
     // Renders the hyperlink.
     void OnPaint(wxPaintEvent& event);
 
+    // Returns the wxRect of the label of this hyperlink.
+    // This is different from the clientsize's rectangle when
+    // clientsize != bestsize and this rectangle is influenced
+    // by the alignment of the label (wxHL_ALIGN_*).
+    wxRect GetLabelRect() const;
+
     // If the click originates inside the bounding box of the label,
     // a flag is set so that an event will be fired when the left
     // button is released.
@@ -108,7 +117,7 @@ protected:
 
     // Changes the cursor to a hand, if the mouse is inside the label's
     // bounding box.
-    void OnEnterWindow(wxMouseEvent& event);
+    void OnMotion(wxMouseEvent& event);
 
     // Changes the cursor back to the default, if necessary.
     void OnLeaveWindow(wxMouseEvent& event);
@@ -116,12 +125,14 @@ protected:
     // 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.
-    virtual void DoGetSize(int *width, int *height) const;
     virtual wxSize DoGetBestSize() const;
 
     // creates a context menu with "Copy URL" menuitem