diff options
| author | Pierre Ossman <ossman@cendio.se> | 2014-09-15 09:35:05 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2014-09-15 09:35:05 +0000 |
| commit | 61e1b18f7b45c1005581d600c10d55f82c21e92c (patch) | |
| tree | 76d7a2ded1a188346613a3a5c8d71bb36b98d5d1 /src/Fl_Native_File_Chooser_WIN32.cxx | |
| parent | 53888cf06440f6f3b3d594e0dc80d120c77d2c53 (diff) | |
Consolidate the Win32 init and cleanup code in to one place so
it's easier to keep track of it.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10312 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Native_File_Chooser_WIN32.cxx')
| -rw-r--r-- | src/Fl_Native_File_Chooser_WIN32.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index 56779cd5a..45890b298 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/src/Fl_Native_File_Chooser_WIN32.cxx @@ -34,14 +34,13 @@ LPCWSTR utf8towchar(const char *in); //MG char *wchartoutf8(LPCWSTR in); //MG #include <FL/Fl_Native_File_Chooser.H> +#include <FL/x.H> #define LCURLY_CHR '{' #define RCURLY_CHR '}' #define LBRACKET_CHR '[' #define RBRACKET_CHR ']' -void fl_OleInitialize(); // in Fl.cxx (Windows only) - // STATIC: PRINT WINDOWS 'DOUBLE NULL' STRING (DEBUG) #ifdef DEBUG static void dnullprint(char *wp) { @@ -465,7 +464,7 @@ int CALLBACK Fl_Native_File_Chooser::Dir_CB(HWND win, UINT msg, LPARAM param, LP // SHOW DIRECTORY BROWSER int Fl_Native_File_Chooser::showdir() { // initialize OLE only once - fl_OleInitialize(); // init needed by BIF_USENEWUI + fl_open_display(); // init needed by BIF_USENEWUI ClearBINF(); clear_pathnames(); // PARENT WINDOW |