https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85d60552014b85fd803b87f2a4988e60abb8d45f
commit 85d60552014b85fd803b87f2a4988e60abb8d45f
Author: Giannis Adamopoulos <gadamopou...@reactos.org>
AuthorDate: Sun Apr 28 16:21:16 2019 +0300
Commit: Mark Jansen <mark.jan...@reactos.org>
CommitDate: Tue Aug 20 00:43:47 2019 +0200
[RAPPS] CMainWindow: make szSearchPattern a member
---
base/applications/rapps/gui.cpp | 2 ++
base/applications/rapps/include/gui.h | 4 ----
base/applications/rapps/winmain.cpp | 2 --
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp
index 064ec4ee463..b30cf80d14a 100644
--- a/base/applications/rapps/gui.cpp
+++ b/base/applications/rapps/gui.cpp
@@ -799,6 +799,8 @@ class CMainWindow :
BOOL bSearchEnabled;
BOOL bUpdating;
+ ATL::CStringW szSearchPattern;
+
public:
CMainWindow() :
m_ClientPanel(NULL),
diff --git a/base/applications/rapps/include/gui.h
b/base/applications/rapps/include/gui.h
index 3636ac1a3c3..974a24d3d29 100644
--- a/base/applications/rapps/include/gui.h
+++ b/base/applications/rapps/include/gui.h
@@ -2,9 +2,6 @@
#include <windef.h>
#include <atlstr.h>
-class CAvailableApps;
-
-HWND CreateMainWindow();
DWORD_PTR ListViewGetlParam(INT item);
INT ListViewAddItem(INT ItemIndex, INT IconIndex, LPWSTR lpName, LPARAM
lParam);
VOID SetStatusBarText(LPCWSTR szText);
@@ -17,4 +14,3 @@ VOID NewRichEditText(const ATL::CStringW& szText, DWORD
flags);
VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags);
CAvailableApps * GetAvailableApps();
extern HWND hListView;
-extern ATL::CStringW szSearchPattern;
diff --git a/base/applications/rapps/winmain.cpp
b/base/applications/rapps/winmain.cpp
index 5660db81acd..5d731c54368 100644
--- a/base/applications/rapps/winmain.cpp
+++ b/base/applications/rapps/winmain.cpp
@@ -18,8 +18,6 @@ HINSTANCE hInst;
INT SelectedEnumType = ENUM_ALL_INSTALLED;
SETTINGS_INFO SettingsInfo;
-ATL::CStringW szSearchPattern;
-
class CRAppsModule : public CComModule
{
public:
