Some trivial adjustments to support building
under Win32/mingw with the configure/make on Win7 with Msys. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
74aa645d8f
commit
e2cc1a80f0
@ -27,8 +27,16 @@
|
||||
#ifdef WIN32
|
||||
|
||||
// #define _WIN32_WINNT 0x0501 // needed for OPENFILENAME's 'FlagsEx'
|
||||
#if defined(FL_LIBRARY)
|
||||
# include <windows.h>
|
||||
# include <commdlg.h> // OPENFILENAMEW, GetOpenFileName()
|
||||
# include <shlobj.h> // BROWSEINFOW, SHBrowseForFolder()
|
||||
typedef OPENFILENAMEW fl_OPENFILENAMEW;
|
||||
typedef BROWSEINFOW fl_BROWSEINFOW;
|
||||
#else
|
||||
typedef void fl_OPENFILENAMEW;
|
||||
typedef void fl_BROWSEINFOW;
|
||||
#endif
|
||||
# include <FL/filename.H> // FL_EXPORT
|
||||
|
||||
// Use Apple's chooser
|
||||
|
@ -29,8 +29,8 @@
|
||||
#define _binf_ptr (&_binf)
|
||||
#endif
|
||||
|
||||
# include <stdlib.h> // malloc
|
||||
# include <stdio.h> // sprintf
|
||||
#include <stdlib.h> // malloc
|
||||
#include <stdio.h> // sprintf
|
||||
#include <wchar.h>
|
||||
|
||||
#include "Fl_Native_File_Chooser_common.cxx" // strnew/strfree/strapp/chrcat
|
||||
|
@ -33,6 +33,9 @@
|
||||
// to co-exist, creating conflicts with multipe mapping.
|
||||
|
||||
// FIXME: maybe we can forget about color mapping and assume RGB?
|
||||
//static unsigned fl_cmap[256] = {
|
||||
//#include "../../fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||
//};
|
||||
|
||||
// Translations to win32 data structures:
|
||||
Fl_XMap fl_xmap[256];
|
||||
@ -150,7 +153,7 @@ HBRUSH fl_brush_action(int action) {
|
||||
for (int j=0; j<FL_N_BRUSH; j++) {
|
||||
if (brushes[j].usage>16000)
|
||||
brushes[j].usage -= 16000;
|
||||
else
|
||||
else
|
||||
brushes[j].usage = 0;
|
||||
}
|
||||
}
|
||||
|
@ -29,6 +29,17 @@
|
||||
#include <config.h>
|
||||
#include "config_lib.h"
|
||||
|
||||
// fl_cmap needs to be defined *before* we include Fl_GDI_Graphics_Driver_color.cxx
|
||||
|
||||
/** \addtogroup fl_attributes
|
||||
@{ */
|
||||
|
||||
/* static */
|
||||
unsigned fl_cmap[256] = {
|
||||
#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||
};
|
||||
|
||||
|
||||
// Remove #ifndef FL_LIBRARY_CMAKE and the entire block of #include
|
||||
// statements when the new build system is ready:
|
||||
#ifndef FL_LIBRARY_CMAKE
|
||||
@ -60,14 +71,6 @@
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
/** \addtogroup fl_attributes
|
||||
@{ */
|
||||
|
||||
/* static */
|
||||
unsigned fl_cmap[256] = {
|
||||
#include "fl_cmap.h" // this is a file produced by "cmap.cxx":
|
||||
};
|
||||
|
||||
/**
|
||||
Returns the RGB value(s) for the given FLTK color index.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user