Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use full repaint style instead of size event

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-03-08 04:27:29 +00:00
parent 7450674943
commit 6d020baf20
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/generic/hyperlink.h
View File

@@ -9,12 +9,8 @@
// Licence: wxWindows licence // Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef __GENERICHYPERLINKCTRLH__ #ifndef _WX_GENERICHYPERLINKCTRL_H_
#define __GENERICHYPERLINKCTRLH__ #define _WX_GENERICHYPERLINKCTRL_H_
#include "wx/defs.h"
#include "wx/control.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxGenericHyperlinkCtrl // wxGenericHyperlinkCtrl
@@ -100,10 +96,6 @@ protected:
// handles "Copy URL" menuitem // handles "Copy URL" menuitem
void OnPopUpCopy(wxCommandEvent& event); void OnPopUpCopy(wxCommandEvent& event);
// Refreshes the control to update label's position if necessary
void OnSize(wxSizeEvent& event);
// overridden base class virtuals // overridden base class virtuals
// Returns the best size for the window, which is the size needed // Returns the best size for the window, which is the size needed
@@ -139,4 +131,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxGenericHyperlinkCtrl) DECLARE_DYNAMIC_CLASS(wxGenericHyperlinkCtrl)
}; };
#endif // __GENERICHYPERLINKCTRLH__ #endif // _WX_GENERICHYPERLINKCTRL_H_

11
src/generic/hyperlinkg.cpp
View File

@@ -62,6 +62,9 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
// do validation checks: // do validation checks:
CheckParams(label, url, style); CheckParams(label, url, style);
if ((style & wxHL_ALIGN_LEFT) == 0)
style |= wxFULL_REPAINT_ON_RESIZE;
if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name)) if (!wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name))
return false; return false;
@@ -94,7 +97,6 @@ bool wxGenericHyperlinkCtrl::Create(wxWindow *parent, wxWindowID id,
// with GTK+'s native handling): // with GTK+'s native handling):
Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) ); Connect( wxEVT_PAINT, wxPaintEventHandler(wxGenericHyperlinkCtrl::OnPaint) );
Connect( wxEVT_SIZE, wxSizeEventHandler(wxGenericHyperlinkCtrl::OnSize) );
Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) ); Connect( wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeaveWindow) );
Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) ); Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler(wxGenericHyperlinkCtrl::OnLeftDown) );
@@ -259,11 +261,4 @@ void wxGenericHyperlinkCtrl::OnPopUpCopy( wxCommandEvent& WXUNUSED(event) )
#endif // wxUSE_CLIPBOARD #endif // wxUSE_CLIPBOARD
} }
void wxGenericHyperlinkCtrl::OnSize(wxSizeEvent& WXUNUSED(event))
{
// update the position of the label in the screen respecting
// the selected align flag
Refresh();
}
#endif // wxUSE_HYPERLINKCTRL #endif // wxUSE_HYPERLINKCTRL