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.
This commit is contained in:
Vadim Zeitlin
2021-01-11 03:16:21 +01:00
parent 4986850c63
commit 000856a342

View File

@@ -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: