i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mouse preferences: Build fixes

Browse Source
This commit is contained in:
Adrien Destugues
2020-09-10 20:03:38 +02:00
parent fe88ae51ec
commit 471ecc8763
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/input/MouseSettings.cpp
+2 -3
View File
@@ -33,7 +33,7 @@ MouseSettings::MouseSettings(BString name)
: :
fName(name) fName(name)
{ {
if (_RetrieveSettings() != B_OK) { if (_RetrieveSettings() != B_OK)
Defaults(); Defaults();
fOriginalSettings = fSettings; fOriginalSettings = fSettings;
@@ -503,10 +503,9 @@ MultipleMouseSettings::AddMouseSettings(BString mouse_name)
{ {
if(fDeprecatedMouseSettings != NULL) { if(fDeprecatedMouseSettings != NULL) {
MouseSettings* RetrievedSettings = new (std::nothrow) MouseSettings MouseSettings* RetrievedSettings = new (std::nothrow) MouseSettings
(*fDeprecatedMouseSettings); (*(fDeprecatedMouseSettings->GetSettings()), mouse_name);
if (RetrievedSettings != NULL) { if (RetrievedSettings != NULL) {
RetrievedSettings->fName = mouse_name;
fMouseSettingsObject.insert(std::pair<BString, MouseSettings*> fMouseSettingsObject.insert(std::pair<BString, MouseSettings*>
(mouse_name, RetrievedSettings)); (mouse_name, RetrievedSettings));
src/preferences/input/MouseSettings.h
+1 -1
View File
@@ -77,7 +77,7 @@ private:
mode_mouse fMode, fOriginalMode; mode_mouse fMode, fOriginalMode;
mode_focus_follows_mouse fFocusFollowsMouseMode; mode_focus_follows_mouse fFocusFollowsMouseMode;
mode_focus_follows_mouse fOriginalFocusFollowsMouseMode; mode_focus_follows_mouse fOriginalFocusFollowsMouseMode;
bool fAcceptFirstClick bool fAcceptFirstClick;
bool fOriginalAcceptFirstClick; bool fOriginalAcceptFirstClick;
mouse_settings fSettings, fOriginalSettings; mouse_settings fSettings, fOriginalSettings;