From 000856a3420d629a13b29c981b0bcaa4e804a534 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 11 Jan 2021 03:16:21 +0100
Subject: [PATCH] Make wxWebCredentials available even when wxUSE_WEBREQUEST==0

This fixed build with wxUSE_CREDENTIALDLG==1 but wxUSE_WEBREQUEST==0.

No real changes, this commit just moves the code around.
---
 include/wx/webrequest.h | 44 ++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/include/wx/webrequest.h b/include/wx/webrequest.h
index 75eb170d7a..68b785b9e9 100644
--- a/include/wx/webrequest.h
+++ b/include/wx/webrequest.h
@@ -12,28 +12,11 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_WEBREQUEST
-
-#include "wx/event.h"
-#include "wx/object.h"
 #include "wx/secretstore.h"
-#include "wx/stream.h"
-#include "wx/versioninfo.h"
-
-class wxWebResponse;
-class wxWebSession;
-class wxWebSessionFactory;
-
-class wxWebAuthChallengeImpl;
-class wxWebRequestImpl;
-class wxWebResponseImpl;
-class wxWebSessionImpl;
-
-typedef wxObjectDataPtr<wxWebAuthChallengeImpl> wxWebAuthChallengeImplPtr;
-typedef wxObjectDataPtr<wxWebRequestImpl> wxWebRequestImplPtr;
-typedef wxObjectDataPtr<wxWebResponseImpl> wxWebResponseImplPtr;
-typedef wxObjectDataPtr<wxWebSessionImpl> wxWebSessionImplPtr;
 
+// Note that this class is intentionally defined outside of wxUSE_WEBREQUEST
+// test as it's also used in wxCredentialEntryDialog and can be made available
+// even if wxWebRequest itself is disabled.
 class wxWebCredentials
 {
 public:
@@ -51,6 +34,27 @@ private:
     wxSecretValue m_password;
 };
 
+#if wxUSE_WEBREQUEST
+
+#include "wx/event.h"
+#include "wx/object.h"
+#include "wx/stream.h"
+#include "wx/versioninfo.h"
+
+class wxWebResponse;
+class wxWebSession;
+class wxWebSessionFactory;
+
+class wxWebAuthChallengeImpl;
+class wxWebRequestImpl;
+class wxWebResponseImpl;
+class wxWebSessionImpl;
+
+typedef wxObjectDataPtr<wxWebAuthChallengeImpl> wxWebAuthChallengeImplPtr;
+typedef wxObjectDataPtr<wxWebRequestImpl> wxWebRequestImplPtr;
+typedef wxObjectDataPtr<wxWebResponseImpl> wxWebResponseImplPtr;
+typedef wxObjectDataPtr<wxWebSessionImpl> wxWebSessionImplPtr;
+
 class WXDLLIMPEXP_NET wxWebAuthChallenge
 {
 public: