From a60b8039f5007a760569d6c12b3b39899a345a5f Mon Sep 17 00:00:00 2001
From: AiraYumi <aira.youme@airanyumi.net>
Date: Fri, 11 Oct 2024 18:09:33 +0900
Subject: Remove FLTK (#2832)
---
indra/newview/lldirpicker.cpp | 36 ------------------------------------
indra/newview/lldirpicker.h | 2 --
indra/newview/llfilepicker.h | 8 --------
3 files changed, 46 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 51157fa430..17edca7ccb 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -41,11 +41,6 @@
# include "llfilepicker.h"
#endif
-#ifdef LL_FLTK
- #include "FL/Fl.H"
- #include "FL/Fl_Native_File_Chooser.H"
-#endif
-
#if LL_WINDOWS
#include <shlobj.h>
#endif
@@ -219,28 +214,20 @@ LLDirPicker::LLDirPicker() :
mFileName(NULL),
mLocked(false)
{
-#ifndef LL_FLTK
mFilePicker = new LLFilePicker();
-#endif
reset();
}
LLDirPicker::~LLDirPicker()
{
-#ifndef LL_FLTK
delete mFilePicker;
-#endif
}
void LLDirPicker::reset()
{
-#ifndef LL_FLTK
if (mFilePicker)
mFilePicker->reset();
-#else
- mDir = "";
-#endif
}
bool LLDirPicker::getDir(std::string* filename, bool blocking)
@@ -253,39 +240,16 @@ bool LLDirPicker::getDir(std::string* filename, bool blocking)
return false;
}
-#ifdef LL_FLTK
- gViewerWindow->getWindow()->beforeDialog();
- Fl_Native_File_Chooser flDlg;
- flDlg.title(LLTrans::getString("choose_the_directory").c_str());
- flDlg.type(Fl_Native_File_Chooser::BROWSE_DIRECTORY );
- int res = flDlg.show();
- gViewerWindow->getWindow()->afterDialog();
- if( res == 0 )
- {
- char const *pDir = flDlg.filename(0);
- if( pDir )
- mDir = pDir;
- }
- else if( res == -1 )
- {
- LL_WARNS() << "FLTK failed: " << flDlg.errmsg() << LL_ENDL;
- }
- return !mDir.empty();
-#endif
return false;
}
std::string LLDirPicker::getDirName()
{
-#ifndef LL_FLTK
if (mFilePicker)
{
return mFilePicker->getFirstFile();
}
return "";
-#else
- return mDir;
-#endif
}
#else // not implemented
diff --git a/indra/newview/lldirpicker.h b/indra/newview/lldirpicker.h
index 2ac3db7c2e..dc740caab2 100644
--- a/indra/newview/lldirpicker.h
+++ b/indra/newview/lldirpicker.h
@@ -77,10 +77,8 @@ private:
#if LL_LINUX || LL_DARWIN
// On Linux we just implement LLDirPicker on top of LLFilePicker
-#ifndef LL_FLTK
LLFilePicker *mFilePicker;
#endif
-#endif
std::string* mFileName;
diff --git a/indra/newview/llfilepicker.h b/indra/newview/llfilepicker.h
index e0bd32fe70..4d71a3b392 100644
--- a/indra/newview/llfilepicker.h
+++ b/indra/newview/llfilepicker.h
@@ -174,14 +174,6 @@ private:
void *userdata);
#endif
-#if LL_FLTK
- enum EType
- {
- eSaveFile, eOpenFile, eOpenMultiple
- };
- bool openFileDialog( int32_t filter, bool blocking, EType aType );
-#endif
-
std::vector<std::string> mFiles;
S32 mCurrentFile;
bool mLocked;
--
cgit v1.2.3