Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-23 07:46:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mac OS: remove 5 compilation warnings of this kind:

Browse Source 
warning: comparison of function 'CGDataConsumerCreateWithCFData' not equal to a null pointer is always true
note: prefix with the address-of operator to silence this warning



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10747 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2015-06-10 10:53:25 +00:00
parent d408133397
commit 416c0d99d3
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_Copy_Surface.cxx
+1 -1
View File
@@ -185,7 +185,7 @@ void Fl_Copy_Surface::init_PDF_context(int w, int h)
pdfdata = CFDataCreateMutable(NULL, 0);
CGDataConsumerRef myconsumer;
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
if(CGDataConsumerCreateWithCFData != NULL) {
if (&CGDataConsumerCreateWithCFData != NULL) {
myconsumer = CGDataConsumerCreateWithCFData(pdfdata); // 10.4
}
else
src/Fl_Quartz_Printer.mm
+1 -1
View File
@@ -240,7 +240,7 @@ int Fl_System_Printer::start_page (void)
{
OSStatus status = PMSessionBeginPageNoDialog(printSession, pageFormat, NULL);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if ( PMSessionGetCGGraphicsContext != NULL ) {
if ( &PMSessionGetCGGraphicsContext != NULL ) {
status = PMSessionGetCGGraphicsContext(printSession, &fl_gc);
}
else
src/Fl_Window_shape.cxx
+1 -1
View File
@@ -337,7 +337,7 @@ void Fl_Window::shape(const Fl_Image* img) {
void Fl_Window::draw() {
if (shape_data_) {
# if defined(__APPLE__) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if (shape_data_->mask && (CGContextClipToMask != NULL)) {
if (shape_data_->mask && (&CGContextClipToMask != NULL)) {
CGContextClipToMask(fl_gc, CGRectMake(0,0,w(),h()), shape_data_->mask); // requires Mac OS 10.4
}
CGContextSaveGState(fl_gc);
src/Fl_get_key_mac.cxx
+1 -1
View File
@@ -244,7 +244,7 @@ int Fl::event_key(int k) {
//: returns true, if that key is pressed right now
int Fl::get_key(int k) {
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
if(CGEventSourceKeyState != NULL) {
if (&CGEventSourceKeyState != NULL) {
return (int)CGEventSourceKeyState(kCGEventSourceStateCombinedSessionState, fltk2mac(k) );
}
else
src/screen_xywh.cxx
+1 -1
View File
@@ -131,7 +131,7 @@ static void screen_init() {
screens[i].width = int(r.size.width);
screens[i].height = int(r.size.height);
//fprintf(stderr,"screen %d %dx%dx%dx%d\n",i,screens[i].x,screens[i].y,screens[i].width,screens[i].height);
if (CGDisplayScreenSize != NULL) {
if (&CGDisplayScreenSize != NULL) {
CGSize s = CGDisplayScreenSize(displays[i]); // from 10.3
dpi_h[i] = screens[i].width / (s.width/25.4);
dpi_v[i] = screens[i].height / (s.height/25.4);