diff options
| -rw-r--r-- | autobuild.xml | 30 | ||||
| -rw-r--r-- | indra/cmake/UI.cmake | 3 | ||||
| -rw-r--r-- | indra/newview/lldirpicker.cpp | 36 | ||||
| -rw-r--r-- | indra/newview/lldirpicker.h | 2 | ||||
| -rw-r--r-- | indra/newview/llfilepicker.h | 8 |
5 files changed, 1 insertions, 78 deletions
diff --git a/autobuild.xml b/autobuild.xml index 4f187c3c18..70d7216486 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -65,36 +65,6 @@ </map> </map> </map> - <key>fltk</key> - <map> - <key>platforms</key> - <map> - <key>linux64</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>691fef2ddd57d7b6c26e87fc82d9ace3f54e078c</string> - <key>hash_algorithm</key> - <string>sha1</string> - <key>url</key> - <string>https://github.com/secondlife/3p-fltk/releases/download/v1.3.9-r1/fltk-1.3.9.8556992788-linux64-8556992788.tar.zst</string> - </map> - <key>name</key> - <string>linux</string> - </map> - </map> - <key>license</key> - <string>LGPL/fltk</string> - <key>license_file</key> - <string>LICENSES/fltk.txt</string> - <key>copyright</key> - <string>Copyright (C) fltk project</string> - <key>version</key> - <string>1.3.5</string> - <key>name</key> - <string>fltk</string> - </map> <key>apr_suite</key> <map> <key>platforms</key> diff --git a/indra/cmake/UI.cmake b/indra/cmake/UI.cmake index a407f68db3..23bd8018dd 100644 --- a/indra/cmake/UI.cmake +++ b/indra/cmake/UI.cmake @@ -7,7 +7,7 @@ add_library( ll::uilibraries INTERFACE IMPORTED ) if (LINUX) use_prebuilt_binary(fltk) - target_compile_definitions(ll::uilibraries INTERFACE LL_FLTK=1 LL_X11=1 ) + target_compile_definitions(ll::uilibraries INTERFACE LL_X11=1 ) if( USE_CONAN ) return() @@ -23,7 +23,6 @@ if (LINUX) endif() target_link_libraries( ll::uilibraries INTERFACE - fltk Xrender Xcursor Xfixes 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; |