mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix trailing whitespace and a MSVC compiler warning

Browse Source 
No code changes
This commit is contained in:
Albrecht Schlosser 2021-12-14 23:55:21 +01:00
parent f76e579ffe
commit f57b074378
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fluid/print_panel.cxx
View File

@ -214,14 +214,14 @@ Fl_Button *print_output_mode[4]={(Fl_Button *)0};
static void cb_Save(Fl_Return_Button*, void*) {
print_properties_panel->hide();
char name[1024];
int val;
const char *printer = (const char *)print_choice->menu()[print_choice->value()].user_data();
snprintf(name, sizeof(name), "%s/page_size", printer);
fluid_prefs.set(name, print_page_size->value());
snprintf(name, sizeof(name), "%s/output_mode", printer);
for (val = 0; val < 4; val ++) {
if (print_output_mode[val]->value()) break;

28
fluid/template_panel.cxx
View File

@ -38,7 +38,7 @@ static void cb_template_panel(Fl_Double_Window*, void*) {
Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
if (img) img->release();
template_preview->image(0);
template_browser->deselect();
template_name->value("");
template_instance->value("");
@ -56,38 +56,38 @@ static void cb_template_browser(Fl_Browser*, void*) {
if (img) img->release();
template_preview->image(0);
template_preview->redraw();
int item = template_browser->value();
if (item <= 1) template_instance->deactivate();
else template_instance->activate();
if (item < 1) {
template_submit->deactivate();
template_delete->deactivate();
return;
}
template_submit->activate();
const char *flfile = (const char *)template_browser->data(item);
if (!flfile) {
template_delete->deactivate();
return;
}
template_name->value(template_browser->text(item));
template_delete->activate();
char pngfile[1024], *ext;
strlcpy(pngfile, flfile, sizeof(pngfile));
if ((ext = strrchr(pngfile, '.')) == NULL) return;
strcpy(ext, ".png");
img = Fl_Shared_Image::get(pngfile);
if (img) {
template_preview->image(img);
template_preview->redraw();
@ -113,7 +113,7 @@ static void cb_Cancel(Fl_Button*, void*) {
Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
if (img) img->release();
template_preview->image(0);
template_browser->deselect();
template_name->value("");
template_instance->value("");
@ -126,7 +126,7 @@ static void cb_template_submit(Fl_Return_Button*, void*) {
Fl_Shared_Image *img = (Fl_Shared_Image *)template_preview->image();
if (img) img->release();
template_preview->image(0);
template_panel->hide();
}

2
src/CMakeLists.txt
View File

@ -215,7 +215,7 @@ if (USE_X11)
Fl_Native_File_Chooser_GTK.cxx
Fl_get_key.cxx
)
if (OPTION_USE_KDIALOG)
set (DRIVER_FILES ${DRIVER_FILES} Fl_Native_File_Chooser_Kdialog.cxx)
endif (OPTION_USE_KDIALOG)

2
src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
View File

@ -271,7 +271,7 @@ void Fl_GDI_Graphics_Driver::set_spot(int font, int size, int X, int Y, int W, i
COMPOSITIONFORM cfs;
float s = scale();
cfs.dwStyle = CFS_POINT;
cfs.ptCurrentPos.x = X * s;
cfs.ptCurrentPos.x = int(X * s);
cfs.ptCurrentPos.y = int(Y * s) - int(tw->labelsize() * s);
// Attempt to have temporary text entered by input method use scaled font.
// Does good, but still not always effective.

4
test/coordinates.cxx
View File

@ -69,7 +69,7 @@ public:
Box* tr_box = new Box(275, 50, 200, 40, FL_BLUE,
"Fl_Box tr(275, 50, 200, 40)\nx, y relative to main window");
tr_group->end();
Fl_Group* bl_group = new Fl_Group(0, 100, 250, 100);
bl_group->box(FL_ENGRAVED_BOX);
Title* bl_title = new Title(10, 110, 230, 40, FL_BLACK,
@ -77,7 +77,7 @@ public:
Box* bl_box = new Box(25, 150, 200, 40, FL_BLACK,
"Fl_Box bl(25, 150, 200, 40)\nx, y relative to main window");
bl_group->end();
// member variable
message_box = new Fl_Box(0, 201, 500, 30);
message_box->align(FL_ALIGN_INSIDE | FL_ALIGN_CENTER);