diff options
| author | AiraYumi <aira.youme@airanyumi.net> | 2024-06-13 10:39:05 +0900 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-06-14 19:32:20 +0300 |
| commit | c4fc76efefd12c7cb1224dc8a748da2958f4a7f0 (patch) | |
| tree | 359f25aa46d16b04ce679deeda959cc5654aeb59 /indra/newview/lldirpicker.cpp | |
| parent | c10e785e338aa63165c614d926ce882f4f116716 (diff) | |
Revert "Replace LL_X11 and LL_FLTK to LL_LINUX"
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp index 957bd6a4d3..75875551f4 100644 --- a/indra/newview/lldirpicker.cpp +++ b/indra/newview/lldirpicker.cpp @@ -41,7 +41,7 @@ # include "llfilepicker.h" #endif -#ifdef LL_LINUX +#ifdef LL_FLTK #include "FL/Fl.H" #include "FL/Fl_Native_File_Chooser.H" #endif @@ -197,7 +197,7 @@ LLDirPicker::LLDirPicker() : mFileName(NULL), mLocked(false) { -#ifndef LL_LINUX +#ifndef LL_FLTK mFilePicker = new LLFilePicker(); #endif reset(); @@ -205,7 +205,7 @@ LLDirPicker::LLDirPicker() : LLDirPicker::~LLDirPicker() { -#ifndef LL_LINUX +#ifndef LL_FLTK delete mFilePicker; #endif } @@ -213,7 +213,7 @@ LLDirPicker::~LLDirPicker() void LLDirPicker::reset() { -#ifndef LL_LINUX +#ifndef LL_FLTK if (mFilePicker) mFilePicker->reset(); #else @@ -231,7 +231,7 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking) return FALSE; } -#ifdef LL_LINUX +#ifdef LL_FLTK gViewerWindow->getWindow()->beforeDialog(); Fl_Native_File_Chooser flDlg; flDlg.title(LLTrans::getString("choose_the_directory").c_str()); @@ -254,7 +254,7 @@ BOOL LLDirPicker::getDir(std::string* filename, bool blocking) std::string LLDirPicker::getDirName() { -#ifndef LL_LINUX +#ifndef LL_FLTK if (mFilePicker) { return mFilePicker->getFirstFile(); |