diff --git a/docs/doxygen/images/wxmac/animationctrl.png b/docs/doxygen/images/wxmac/animationctrl.png index 49d88fd35f..ccf4e235dd 100644 Binary files a/docs/doxygen/images/wxmac/animationctrl.png and b/docs/doxygen/images/wxmac/animationctrl.png differ diff --git a/docs/doxygen/images/wxmac/bitmapbutton.png b/docs/doxygen/images/wxmac/bitmapbutton.png index fb52a6a0e7..0a6b8a4337 100644 Binary files a/docs/doxygen/images/wxmac/bitmapbutton.png and b/docs/doxygen/images/wxmac/bitmapbutton.png differ diff --git a/docs/doxygen/images/wxmac/bitmapcombobox.png b/docs/doxygen/images/wxmac/bitmapcombobox.png index a1da09c058..403ed66363 100644 Binary files a/docs/doxygen/images/wxmac/bitmapcombobox.png and b/docs/doxygen/images/wxmac/bitmapcombobox.png differ diff --git a/docs/doxygen/images/wxmac/button.png b/docs/doxygen/images/wxmac/button.png index 9ae0015bb3..78755128ba 100644 Binary files a/docs/doxygen/images/wxmac/button.png and b/docs/doxygen/images/wxmac/button.png differ diff --git a/docs/doxygen/images/wxmac/calendarctrl.png b/docs/doxygen/images/wxmac/calendarctrl.png index b6563948f9..6b26b6656a 100644 Binary files a/docs/doxygen/images/wxmac/calendarctrl.png and b/docs/doxygen/images/wxmac/calendarctrl.png differ diff --git a/docs/doxygen/images/wxmac/checkbox.png b/docs/doxygen/images/wxmac/checkbox.png index d1bef08d2a..63b083bd45 100644 Binary files a/docs/doxygen/images/wxmac/checkbox.png and b/docs/doxygen/images/wxmac/checkbox.png differ diff --git a/docs/doxygen/images/wxmac/checklistbox.png b/docs/doxygen/images/wxmac/checklistbox.png index 2ecb1252eb..8e848e0f1d 100644 Binary files a/docs/doxygen/images/wxmac/checklistbox.png and b/docs/doxygen/images/wxmac/checklistbox.png differ diff --git a/docs/doxygen/images/wxmac/choice.png b/docs/doxygen/images/wxmac/choice.png index e26572d105..85bef69a11 100644 Binary files a/docs/doxygen/images/wxmac/choice.png and b/docs/doxygen/images/wxmac/choice.png differ diff --git a/docs/doxygen/images/wxmac/collapsiblepane.png b/docs/doxygen/images/wxmac/collapsiblepane.png index 1c2f4979aa..7b7ac2b9e7 100644 Binary files a/docs/doxygen/images/wxmac/collapsiblepane.png and b/docs/doxygen/images/wxmac/collapsiblepane.png differ diff --git a/docs/doxygen/images/wxmac/colourpickerctrl.png b/docs/doxygen/images/wxmac/colourpickerctrl.png index a5a281a42e..402b3821c5 100644 Binary files a/docs/doxygen/images/wxmac/colourpickerctrl.png and b/docs/doxygen/images/wxmac/colourpickerctrl.png differ diff --git a/docs/doxygen/images/wxmac/combobox.png b/docs/doxygen/images/wxmac/combobox.png index b071079704..b939e2f758 100644 Binary files a/docs/doxygen/images/wxmac/combobox.png and b/docs/doxygen/images/wxmac/combobox.png differ diff --git a/docs/doxygen/images/wxmac/comboctrl.png b/docs/doxygen/images/wxmac/comboctrl.png index 5c1e95f930..f38dedecd6 100644 Binary files a/docs/doxygen/images/wxmac/comboctrl.png and b/docs/doxygen/images/wxmac/comboctrl.png differ diff --git a/docs/doxygen/images/wxmac/datepickerctrl.png b/docs/doxygen/images/wxmac/datepickerctrl.png index 4f73e668ed..51c989c78c 100644 Binary files a/docs/doxygen/images/wxmac/datepickerctrl.png and b/docs/doxygen/images/wxmac/datepickerctrl.png differ diff --git a/docs/doxygen/images/wxmac/dirpickerctrl.png b/docs/doxygen/images/wxmac/dirpickerctrl.png index 0f2f145f34..2e5642b3ca 100644 Binary files a/docs/doxygen/images/wxmac/dirpickerctrl.png and b/docs/doxygen/images/wxmac/dirpickerctrl.png differ diff --git a/docs/doxygen/images/wxmac/filepickerctrl.png b/docs/doxygen/images/wxmac/filepickerctrl.png index aaec532dc6..09cce336fe 100644 Binary files a/docs/doxygen/images/wxmac/filepickerctrl.png and b/docs/doxygen/images/wxmac/filepickerctrl.png differ diff --git a/docs/doxygen/images/wxmac/fontpickerctrl.png b/docs/doxygen/images/wxmac/fontpickerctrl.png index 49fa12692c..4b0ea72836 100644 Binary files a/docs/doxygen/images/wxmac/fontpickerctrl.png and b/docs/doxygen/images/wxmac/fontpickerctrl.png differ diff --git a/docs/doxygen/images/wxmac/gauge.png b/docs/doxygen/images/wxmac/gauge.png index c37b75b14c..f6e69ac22e 100644 Binary files a/docs/doxygen/images/wxmac/gauge.png and b/docs/doxygen/images/wxmac/gauge.png differ diff --git a/docs/doxygen/images/wxmac/genericdirctrl.png b/docs/doxygen/images/wxmac/genericdirctrl.png index 66b5306755..0c65af4775 100644 Binary files a/docs/doxygen/images/wxmac/genericdirctrl.png and b/docs/doxygen/images/wxmac/genericdirctrl.png differ diff --git a/docs/doxygen/images/wxmac/hyperlinkctrl.png b/docs/doxygen/images/wxmac/hyperlinkctrl.png index 1b9c9a8c29..7b1ed2d5be 100644 Binary files a/docs/doxygen/images/wxmac/hyperlinkctrl.png and b/docs/doxygen/images/wxmac/hyperlinkctrl.png differ diff --git a/docs/doxygen/images/wxmac/listbox.png b/docs/doxygen/images/wxmac/listbox.png index abe0cb38e0..d1cd3e82c0 100644 Binary files a/docs/doxygen/images/wxmac/listbox.png and b/docs/doxygen/images/wxmac/listbox.png differ diff --git a/docs/doxygen/images/wxmac/listctrl.png b/docs/doxygen/images/wxmac/listctrl.png index 4baf85ebb9..aa31238923 100644 Binary files a/docs/doxygen/images/wxmac/listctrl.png and b/docs/doxygen/images/wxmac/listctrl.png differ diff --git a/docs/doxygen/images/wxmac/ownerdrawncombobox.png b/docs/doxygen/images/wxmac/ownerdrawncombobox.png index 28e97f3eca..f60cec5799 100644 Binary files a/docs/doxygen/images/wxmac/ownerdrawncombobox.png and b/docs/doxygen/images/wxmac/ownerdrawncombobox.png differ diff --git a/docs/doxygen/images/wxmac/radiobox.png b/docs/doxygen/images/wxmac/radiobox.png index 7cd9f2f997..09d7886e0e 100644 Binary files a/docs/doxygen/images/wxmac/radiobox.png and b/docs/doxygen/images/wxmac/radiobox.png differ diff --git a/docs/doxygen/images/wxmac/radiobutton.png b/docs/doxygen/images/wxmac/radiobutton.png index 7f48f3cefe..bda87e9c4c 100644 Binary files a/docs/doxygen/images/wxmac/radiobutton.png and b/docs/doxygen/images/wxmac/radiobutton.png differ diff --git a/docs/doxygen/images/wxmac/richtextctrl.png b/docs/doxygen/images/wxmac/richtextctrl.png index 0cb034b39b..1afce2f050 100644 Binary files a/docs/doxygen/images/wxmac/richtextctrl.png and b/docs/doxygen/images/wxmac/richtextctrl.png differ diff --git a/docs/doxygen/images/wxmac/scrollbar.png b/docs/doxygen/images/wxmac/scrollbar.png index d4fd151ea6..3c13685d4a 100644 Binary files a/docs/doxygen/images/wxmac/scrollbar.png and b/docs/doxygen/images/wxmac/scrollbar.png differ diff --git a/docs/doxygen/images/wxmac/slider.png b/docs/doxygen/images/wxmac/slider.png index 7507bd9df2..3098582478 100644 Binary files a/docs/doxygen/images/wxmac/slider.png and b/docs/doxygen/images/wxmac/slider.png differ diff --git a/docs/doxygen/images/wxmac/spinbutton.png b/docs/doxygen/images/wxmac/spinbutton.png index 9328020e10..f3dd7ab46f 100644 Binary files a/docs/doxygen/images/wxmac/spinbutton.png and b/docs/doxygen/images/wxmac/spinbutton.png differ diff --git a/docs/doxygen/images/wxmac/spinctrl.png b/docs/doxygen/images/wxmac/spinctrl.png index 4533b2a0b5..94c8660d27 100644 Binary files a/docs/doxygen/images/wxmac/spinctrl.png and b/docs/doxygen/images/wxmac/spinctrl.png differ diff --git a/docs/doxygen/images/wxmac/staticbitmap.png b/docs/doxygen/images/wxmac/staticbitmap.png index ace067e4be..4da6fe8c21 100644 Binary files a/docs/doxygen/images/wxmac/staticbitmap.png and b/docs/doxygen/images/wxmac/staticbitmap.png differ diff --git a/docs/doxygen/images/wxmac/staticbox.png b/docs/doxygen/images/wxmac/staticbox.png index d5b9837828..be20e09534 100644 Binary files a/docs/doxygen/images/wxmac/staticbox.png and b/docs/doxygen/images/wxmac/staticbox.png differ diff --git a/docs/doxygen/images/wxmac/statictext.png b/docs/doxygen/images/wxmac/statictext.png index 65736d4863..26b7b4cd58 100644 Binary files a/docs/doxygen/images/wxmac/statictext.png and b/docs/doxygen/images/wxmac/statictext.png differ diff --git a/docs/doxygen/images/wxmac/textctrl.png b/docs/doxygen/images/wxmac/textctrl.png index 2e0e52840f..40132acb8d 100644 Binary files a/docs/doxygen/images/wxmac/textctrl.png and b/docs/doxygen/images/wxmac/textctrl.png differ diff --git a/docs/doxygen/images/wxmac/togglebutton.png b/docs/doxygen/images/wxmac/togglebutton.png index 4e24983035..a20aa87923 100644 Binary files a/docs/doxygen/images/wxmac/togglebutton.png and b/docs/doxygen/images/wxmac/togglebutton.png differ diff --git a/docs/doxygen/images/wxmac/treectrl.png b/docs/doxygen/images/wxmac/treectrl.png index 486e90b981..190c623413 100644 Binary files a/docs/doxygen/images/wxmac/treectrl.png and b/docs/doxygen/images/wxmac/treectrl.png differ diff --git a/utils/screenshotgen/src/autocapture.cpp b/utils/screenshotgen/src/autocapture.cpp index 3549158224..00a7587bc4 100644 --- a/utils/screenshotgen/src/autocapture.cpp +++ b/utils/screenshotgen/src/autocapture.cpp @@ -87,7 +87,7 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, int x, int y, } while(!fullscreen.IsOk()); - bitmap = fullscreen.GetSubBitmap(wxRect(x,y,width,height)); + *bitmap = fullscreen.GetSubBitmap(wxRect(x, y, width, height)); // to prevent loading the old screenshot next time system("rm /tmp/wx_screen_capture.png"); @@ -171,7 +171,7 @@ void AutoCaptureMechanism::CaptureAll() } // create the screenshot - wxBitmap screenshot(0, 0); + wxBitmap screenshot(1, 1); Capture(&screenshot, ctrl); if(ctrl.flag & AJ_Union) @@ -181,9 +181,9 @@ void AutoCaptureMechanism::CaptureAll() { ++it; it->name = ctrl.name; //preserving the name - wxBitmap screenshot2(0, 0); + wxBitmap screenshot2(1, 1); Capture(&screenshot2, *it); - wxBitmap combined(0, 0); + wxBitmap combined(1, 1); Union(&screenshot, &screenshot2, &combined); screenshot = combined; } diff --git a/utils/screenshotgen/src/autocapture.h b/utils/screenshotgen/src/autocapture.h index 9984c21c97..06871723d2 100644 --- a/utils/screenshotgen/src/autocapture.h +++ b/utils/screenshotgen/src/autocapture.h @@ -279,13 +279,13 @@ public: /** Take a screenshot for the given region. - @param bitmap - Bitmap to save the screenshot to. + @param bitmap + Bitmap to save the screenshot to. @param rect - Given rectangular region. + Given rectangular region. @param delay - Only useful for Mac, for fixing a delay bug. It seems that it - didn't fix the bug, so it might be removed soon. + Only useful for Mac, for fixing a delay bug. It seems that it + didn't fix the bug, so it might be removed soon. */ static bool Capture(wxBitmap* bitmap, wxRect rect, int delay = 0); diff --git a/utils/screenshotgen/src/screenshot_main.cpp b/utils/screenshotgen/src/screenshot_main.cpp index 308ab3cdc5..5ff5195828 100644 --- a/utils/screenshotgen/src/screenshot_main.cpp +++ b/utils/screenshotgen/src/screenshot_main.cpp @@ -82,7 +82,7 @@ void ScreenshotFrame::OnCaptureFullScreen(wxCommandEvent& WXUNUSED(event)) wxCoord screenWidth, screenHeight; dcScreen.GetSize(&screenWidth, &screenHeight); - wxBitmap fullscreen(0, 0); + wxBitmap fullscreen(1, 1); AutoCaptureMechanism::Capture(&fullscreen, 0, 0, screenWidth, screenHeight); AutoCaptureMechanism::Save(&fullscreen, _T("fullscreen"));