diff options
| author | Nicky <nicky.dasmijn@posteo.nl> | 2024-07-26 16:23:54 +0200 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-28 21:22:48 +0800 |
| commit | cf11376a6f371afa1b7bcfbc8b366a60e38ace8b (patch) | |
| tree | 006373a20a32be06b0587a726a6c412d1c153868 /indra/llwindow | |
| parent | e024b81c2660a1183fa014f36932c8daca244d35 (diff) | |
Post merge cleanup of Linux code
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 2 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index f667ff7542..079fca00c0 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -427,7 +427,7 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks, #if LL_X11 mSDL_XWindowID = None; - mSDL_Display = NULL; + mSDL_Display = nullptr; #endif // LL_X11 // Assume 4:3 aspect ratio until we know better diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h index 3ed2811572..3acda71157 100644 --- a/indra/llwindow/llwindowsdl.h +++ b/indra/llwindow/llwindowsdl.h @@ -285,7 +285,6 @@ protected: int mHaveInputFocus; /* 0=no, 1=yes, else unknown */ int mIsMinimized; /* 0=no, 1=yes, else unknown */ - int mIsActive; /* 0=no, 1=yes, else unknown */ friend class LLWindowManager; @@ -316,6 +315,8 @@ public: void clearSecondaryText() { mSecondaryClipboard.clear(); } private: + void tryFindFullscreenSize(int &aWidth, int &aHeight); + void initialiseX11Clipboard(); bool getSelectionText(Atom selection, LLWString &text); @@ -323,10 +324,8 @@ private: bool getSelectionText(Atom selection, Atom type, LLWString &text); bool setSelectionText(Atom selection, const LLWString &text); -#endif - - void tryFindFullscreenSize(int &aWidth, int &aHeight); +#endif LLWString mPrimaryClipboard; LLWString mSecondaryClipboard; }; |