Added missing wxBitmapComboBox::Insert() implementation

[wxWidgets.git] / src / msw / hyperlink.cpp

diff --git a/src/msw/hyperlink.cpp b/src/msw/hyperlink.cpp
index 4e1ec86e7e1845d151460f0d51fdfc07efbc3702..de729770fd53bf3853bae9b10fc64fa8b1b4b317 100644 (file)
--- a/src/msw/hyperlink.cpp
+++ b/src/msw/hyperlink.cpp
@@ -19,12 +19,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_HYPERLINKCTRL
+#if wxUSE_HYPERLINKCTRL && wxUSE_UNICODE

 
 #include "wx/hyperlink.h"
 
 #ifndef WX_PRECOMP
 
 #include "wx/hyperlink.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/app.h"

     #include "wx/stattext.h"
     #include "wx/stattext.h"

+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+    #include "wx/msw/private.h"
+    #include "wx/msw/missing.h"

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -39,6 +43,10 @@
     #define LWS_RIGHT 0x0020
 #endif
 
     #define LWS_RIGHT 0x0020
 #endif
 

+#ifndef WC_LINK
+    #define WC_LINK L"SysLink"
+#endif
+

 // ----------------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------------


@@ -47,7 +55,10 @@ namespace
 {
     bool HasNativeHyperlinkCtrl()
     {
 {
     bool HasNativeHyperlinkCtrl()
     {

-        return wxGetWinVersion() >= wxWinVersion_XP;
+        // Notice that we really must test comctl32.dll version and not the OS
+        // version here as even under Vista/7 we could be not using the v6 e.g.
+        // if the program doesn't have the correct manifest for some reason.
+        return wxApp::GetComCtl32Version() >= 600;

     }
 
     wxString GetLabelForSysLink(const wxString& text, const wxString& url)
     }
 
     wxString GetLabelForSysLink(const wxString& text, const wxString& url)


@@ -143,7 +154,7 @@ wxSize wxHyperlinkCtrl::DoGetBestClientSize() const
 {
     // LM_GETIDEALSIZE only exists under Vista so use the generic version even
     // when using the native control under XP
 {
     // LM_GETIDEALSIZE only exists under Vista so use the generic version even
     // when using the native control under XP

-    if ( wxGetWinVersion() < wxWinVersion_6 )
+    if ( !HasNativeHyperlinkCtrl() || (wxGetWinVersion() < wxWinVersion_6) )

         return wxGenericHyperlinkCtrl::DoGetBestClientSize();
 
     SIZE idealSize;
         return wxGenericHyperlinkCtrl::DoGetBestClientSize();
 
     SIZE idealSize;


@@ -169,4 +180,4 @@ bool wxHyperlinkCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
    return wxGenericHyperlinkCtrl::MSWOnNotify(idCtrl, lParam, result);
 }
 
    return wxGenericHyperlinkCtrl::MSWOnNotify(idCtrl, lParam, result);
 }
 

-#endif // wxUSE_HYPERLINKCTRL
+#endif // wxUSE_HYPERLINKCTRL && wxUSE_UNICODE