mirror of
https://github.com/fltk/fltk.git
synced 2026-05-31 22:04:26 +08:00
Fixed missing config.h includes in X11 after QD removal.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6426 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -64,7 +64,7 @@ void Fl_Double_Window::show() {
|
|||||||
Fl_Window::show();
|
Fl_Window::show();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(X11)
|
#if defined(USE_X11)
|
||||||
|
|
||||||
// maybe someone feels inclined to implement alpha blending on X11?
|
// maybe someone feels inclined to implement alpha blending on X11?
|
||||||
char fl_can_do_alpha_blending() {
|
char fl_can_do_alpha_blending() {
|
||||||
|
|||||||
@@ -38,9 +38,7 @@
|
|||||||
#include <FL/Fl.H>
|
#include <FL/Fl.H>
|
||||||
#include <FL/x.H>
|
#include <FL/x.H>
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
void Fl_Window::border(int b) {
|
void Fl_Window::border(int b) {
|
||||||
if (b) {
|
if (b) {
|
||||||
|
|||||||
+1
-3
@@ -45,9 +45,7 @@
|
|||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
# include <FL/math.h>
|
# include <FL/math.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __APPLE__
|
#include <config.h>
|
||||||
# include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Draw ellipse sections using integer coordinates.
|
Draw ellipse sections using integer coordinates.
|
||||||
|
|||||||
+2
-2
@@ -114,7 +114,7 @@ int fl_correct_encoding(const char* name) {
|
|||||||
return (*c++ && !strcmp(c,fl_encoding));
|
return (*c++ && !strcmp(c,fl_encoding));
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *find_best_font(const char *fname, int size) {
|
static const char *find_best_font(const char *fname, int size) {
|
||||||
int cnt;
|
int cnt;
|
||||||
static char **list = NULL;
|
static char **list = NULL;
|
||||||
// locate or create an Fl_Font_Descriptor for a given Fl_Fontdesc and size:
|
// locate or create an Fl_Font_Descriptor for a given Fl_Fontdesc and size:
|
||||||
@@ -189,7 +189,7 @@ static char *put_font_size(const char *n, int size)
|
|||||||
int i = 0;
|
int i = 0;
|
||||||
char *buf;
|
char *buf;
|
||||||
const char *ptr;
|
const char *ptr;
|
||||||
char *f;
|
const char *f;
|
||||||
char *name;
|
char *name;
|
||||||
int nbf = 1;
|
int nbf = 1;
|
||||||
name = strdup(n);
|
name = strdup(n);
|
||||||
|
|||||||
Reference in New Issue
Block a user