]> git.saurik.com Git - wxWidgets.git/commitdiff
Small build and run fixes made to screenshotgen util after wxMSW changes.
authorBryan Petty <bryan@ibaku.net>
Wed, 13 May 2009 19:19:01 +0000 (19:19 +0000)
committerBryan Petty <bryan@ibaku.net>
Wed, 13 May 2009 19:19:01 +0000 (19:19 +0000)
Updated wxOSX (Carbon) screenshots in the manual.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

38 files changed:
docs/doxygen/images/wxmac/animationctrl.png
docs/doxygen/images/wxmac/bitmapbutton.png
docs/doxygen/images/wxmac/bitmapcombobox.png
docs/doxygen/images/wxmac/button.png
docs/doxygen/images/wxmac/calendarctrl.png
docs/doxygen/images/wxmac/checkbox.png
docs/doxygen/images/wxmac/checklistbox.png
docs/doxygen/images/wxmac/choice.png
docs/doxygen/images/wxmac/collapsiblepane.png
docs/doxygen/images/wxmac/colourpickerctrl.png
docs/doxygen/images/wxmac/combobox.png
docs/doxygen/images/wxmac/comboctrl.png
docs/doxygen/images/wxmac/datepickerctrl.png
docs/doxygen/images/wxmac/dirpickerctrl.png
docs/doxygen/images/wxmac/filepickerctrl.png
docs/doxygen/images/wxmac/fontpickerctrl.png
docs/doxygen/images/wxmac/gauge.png
docs/doxygen/images/wxmac/genericdirctrl.png
docs/doxygen/images/wxmac/hyperlinkctrl.png
docs/doxygen/images/wxmac/listbox.png
docs/doxygen/images/wxmac/listctrl.png
docs/doxygen/images/wxmac/ownerdrawncombobox.png
docs/doxygen/images/wxmac/radiobox.png
docs/doxygen/images/wxmac/radiobutton.png
docs/doxygen/images/wxmac/richtextctrl.png
docs/doxygen/images/wxmac/scrollbar.png
docs/doxygen/images/wxmac/slider.png
docs/doxygen/images/wxmac/spinbutton.png
docs/doxygen/images/wxmac/spinctrl.png
docs/doxygen/images/wxmac/staticbitmap.png
docs/doxygen/images/wxmac/staticbox.png
docs/doxygen/images/wxmac/statictext.png
docs/doxygen/images/wxmac/textctrl.png
docs/doxygen/images/wxmac/togglebutton.png
docs/doxygen/images/wxmac/treectrl.png
utils/screenshotgen/src/autocapture.cpp
utils/screenshotgen/src/autocapture.h
utils/screenshotgen/src/screenshot_main.cpp

index 49d88fd35fb55f7d9385c8c9e03f7eaf01ca7ae9..ccf4e235dd90651282010245ecec646822a9ddb1 100644 (file)
Binary files a/docs/doxygen/images/wxmac/animationctrl.png and b/docs/doxygen/images/wxmac/animationctrl.png differ
index fb52a6a0e71256d802797823ba03036ef833fb30..0a6b8a43371453ebd4faf2d7a6e2c69efd3fe3e7 100644 (file)
Binary files a/docs/doxygen/images/wxmac/bitmapbutton.png and b/docs/doxygen/images/wxmac/bitmapbutton.png differ
index a1da09c058af79803491539d43e77f099067b78a..403ed663632450389132f421f2f771902384980d 100644 (file)
Binary files a/docs/doxygen/images/wxmac/bitmapcombobox.png and b/docs/doxygen/images/wxmac/bitmapcombobox.png differ
index 9ae0015bb312744b1d32d4f24d1a0e9462d4b4ab..78755128badaf8877f9046d4550a99d760897fc6 100644 (file)
Binary files a/docs/doxygen/images/wxmac/button.png and b/docs/doxygen/images/wxmac/button.png differ
index b6563948f96072edec4a64a011e63d62341d7680..6b26b6656a93d4eec6716806a9c1073513e42383 100644 (file)
Binary files a/docs/doxygen/images/wxmac/calendarctrl.png and b/docs/doxygen/images/wxmac/calendarctrl.png differ
index d1bef08d2a1ef72e1341b144114b0f29118fee52..63b083bd45e82a9cabbe138c6de42b38aa2c7227 100644 (file)
Binary files a/docs/doxygen/images/wxmac/checkbox.png and b/docs/doxygen/images/wxmac/checkbox.png differ
index 2ecb1252eb7ea6045f1e534cb6da6fb1f3316543..8e848e0f1d5121292fc4c57420add4fa287b5ac5 100644 (file)
Binary files a/docs/doxygen/images/wxmac/checklistbox.png and b/docs/doxygen/images/wxmac/checklistbox.png differ
index e26572d105394c2ab87139b1b1f285057b56af7a..85bef69a11e34f2c78ea909654b00a4501830e05 100644 (file)
Binary files a/docs/doxygen/images/wxmac/choice.png and b/docs/doxygen/images/wxmac/choice.png differ
index 1c2f4979aa7e7cc6580c0db57153928eb203cb2e..7b7ac2b9e7e020f62597d397648d0dbc5f20489a 100644 (file)
Binary files a/docs/doxygen/images/wxmac/collapsiblepane.png and b/docs/doxygen/images/wxmac/collapsiblepane.png differ
index a5a281a42e9e92a639662ffb53afce56b54b8a71..402b3821c527e7fa89652f41713ac183bb8ec79e 100644 (file)
Binary files a/docs/doxygen/images/wxmac/colourpickerctrl.png and b/docs/doxygen/images/wxmac/colourpickerctrl.png differ
index b071079704ddbf061f87ad516706959bdbc77fab..b939e2f758adcef2ca647fae78d4dbebb037b0f6 100644 (file)
Binary files a/docs/doxygen/images/wxmac/combobox.png and b/docs/doxygen/images/wxmac/combobox.png differ
index 5c1e95f930d5822c49102ae70a9a055eb624b0c3..f38dedecd64b204d40c3e0bdad3d01a05a4c8956 100644 (file)
Binary files a/docs/doxygen/images/wxmac/comboctrl.png and b/docs/doxygen/images/wxmac/comboctrl.png differ
index 4f73e668ed68da09f9030a254f05a39984e2f228..51c989c78ca5f29ac4a601c439e75bd310671dfc 100644 (file)
Binary files a/docs/doxygen/images/wxmac/datepickerctrl.png and b/docs/doxygen/images/wxmac/datepickerctrl.png differ
index 0f2f145f342239bec7f22155a739cf734af1ad6f..2e5642b3ca80d65f13fa7ffbe24e265578edc972 100644 (file)
Binary files a/docs/doxygen/images/wxmac/dirpickerctrl.png and b/docs/doxygen/images/wxmac/dirpickerctrl.png differ
index aaec532dc669ba9ec29fd8fb7c2e800394c97ea0..09cce336fe18b12530078ed8898d8cfd2d81ccda 100644 (file)
Binary files a/docs/doxygen/images/wxmac/filepickerctrl.png and b/docs/doxygen/images/wxmac/filepickerctrl.png differ
index 49fa12692c1967aed90a67358c6246138ba59da9..4b0ea72836b36a819271107d603b454e4d0dd3fc 100644 (file)
Binary files a/docs/doxygen/images/wxmac/fontpickerctrl.png and b/docs/doxygen/images/wxmac/fontpickerctrl.png differ
index c37b75b14c9b89ad6dc73122e88cf2183fe2f093..f6e69ac22e22d7b2f687fe15fcf2a2b2c980174c 100644 (file)
Binary files a/docs/doxygen/images/wxmac/gauge.png and b/docs/doxygen/images/wxmac/gauge.png differ
index 66b53067557a5aca1f97e4ea9844991a2fc8d19b..0c65af477521c0e28c808fc7ec56b925f9b5c668 100644 (file)
Binary files a/docs/doxygen/images/wxmac/genericdirctrl.png and b/docs/doxygen/images/wxmac/genericdirctrl.png differ
index 1b9c9a8c294b0d1f683afc16a25c53f094935e54..7b1ed2d5be934b3e574c894b0f5dd208772eef32 100644 (file)
Binary files a/docs/doxygen/images/wxmac/hyperlinkctrl.png and b/docs/doxygen/images/wxmac/hyperlinkctrl.png differ
index abe0cb38e0b4502a2818b74d228cc5984273f671..d1cd3e82c026f7b6c2a01b2b34de9edc59b8d249 100644 (file)
Binary files a/docs/doxygen/images/wxmac/listbox.png and b/docs/doxygen/images/wxmac/listbox.png differ
index 4baf85ebb9644e6d2f21e8428606b0e00d942866..aa31238923d92fade21a5fa322e839dd8ec0c026 100644 (file)
Binary files a/docs/doxygen/images/wxmac/listctrl.png and b/docs/doxygen/images/wxmac/listctrl.png differ
index 28e97f3eca150d8d991bec98c399676cc04824cf..f60cec579931d65e20c448b33c3345c87f3e98ca 100644 (file)
Binary files a/docs/doxygen/images/wxmac/ownerdrawncombobox.png and b/docs/doxygen/images/wxmac/ownerdrawncombobox.png differ
index 7cd9f2f997ee86122c1615b46f24a79e2c59ee6e..09d7886e0ec3f05647896a9d3566357935ac25d6 100644 (file)
Binary files a/docs/doxygen/images/wxmac/radiobox.png and b/docs/doxygen/images/wxmac/radiobox.png differ
index 7f48f3cefe4670b808f161987ffab6e0081d18dd..bda87e9c4ca22baaacca15959ced4241add2ecdc 100644 (file)
Binary files a/docs/doxygen/images/wxmac/radiobutton.png and b/docs/doxygen/images/wxmac/radiobutton.png differ
index 0cb034b39bbeee287c3cbcea0fa5c00e2102bd36..1afce2f05012293b3045818c488ef7229322cbc9 100644 (file)
Binary files a/docs/doxygen/images/wxmac/richtextctrl.png and b/docs/doxygen/images/wxmac/richtextctrl.png differ
index d4fd151ea60f404aeeea6abb81a03f5e5af43d34..3c13685d4aa5d9bf81db0000db5b6fc4d6d115b3 100644 (file)
Binary files a/docs/doxygen/images/wxmac/scrollbar.png and b/docs/doxygen/images/wxmac/scrollbar.png differ
index 7507bd9df2fdb965deff9b0e0012b1e9ba6fb525..3098582478d1990968c5232d4cf75a3e2e5ccd11 100644 (file)
Binary files a/docs/doxygen/images/wxmac/slider.png and b/docs/doxygen/images/wxmac/slider.png differ
index 9328020e101a4d08866ce39f971cd74f34971d68..f3dd7ab46ff6dc6e3a4c902ed95731cc5b53e2c0 100644 (file)
Binary files a/docs/doxygen/images/wxmac/spinbutton.png and b/docs/doxygen/images/wxmac/spinbutton.png differ
index 4533b2a0b57042eb55d6bbca45e56f743b626a1b..94c8660d2798d9967fc85a251316df9f2c98867c 100644 (file)
Binary files a/docs/doxygen/images/wxmac/spinctrl.png and b/docs/doxygen/images/wxmac/spinctrl.png differ
index ace067e4bee598fe70e84cd58169cacc750f42b0..4da6fe8c21ec078623d33acb141c154be1399b92 100644 (file)
Binary files a/docs/doxygen/images/wxmac/staticbitmap.png and b/docs/doxygen/images/wxmac/staticbitmap.png differ
index d5b9837828f0de661280167159c251a7439ce741..be20e09534075ac8ec9a5ca27e3a0080fc3f7135 100644 (file)
Binary files a/docs/doxygen/images/wxmac/staticbox.png and b/docs/doxygen/images/wxmac/staticbox.png differ
index 65736d48632548f338f57c64682ad9de1548b5e5..26b7b4cd581c965aca2d4881ac5bee21a3303944 100644 (file)
Binary files a/docs/doxygen/images/wxmac/statictext.png and b/docs/doxygen/images/wxmac/statictext.png differ
index 2e0e52840f72a404afd53f74522aec368983604f..40132acb8d3e85612ec3375cbcb0d8d38d7c10db 100644 (file)
Binary files a/docs/doxygen/images/wxmac/textctrl.png and b/docs/doxygen/images/wxmac/textctrl.png differ
index 4e2498303556e53fb97e239eaf90f345f21dbb2d..a20aa879233e7b4d19d97fc3b3e4ff38bea24309 100644 (file)
Binary files a/docs/doxygen/images/wxmac/togglebutton.png and b/docs/doxygen/images/wxmac/togglebutton.png differ
index 486e90b9816aee4a1e3147447f27bee2df553531..190c623413fe66a16505ebee4cfd59ef1a83b6b3 100644 (file)
Binary files a/docs/doxygen/images/wxmac/treectrl.png and b/docs/doxygen/images/wxmac/treectrl.png differ
index 35491582248e260ec2b6df4295dc5c1045f17c5c..00a7587bc428a89937c8116332f51f8815d67ce5 100644 (file)
@@ -87,7 +87,7 @@ bool AutoCaptureMechanism::Capture(wxBitmap* bitmap, int x, int y,
     }
     while(!fullscreen.IsOk());
 
     }
     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");
 
     // 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
         }
 
         // create the screenshot
-        wxBitmap screenshot(0, 0);
+        wxBitmap screenshot(1, 1);
         Capture(&screenshot, ctrl);
 
         if(ctrl.flag & AJ_Union)
         Capture(&screenshot, ctrl);
 
         if(ctrl.flag & AJ_Union)
@@ -181,9 +181,9 @@ void AutoCaptureMechanism::CaptureAll()
             {
                 ++it;
                 it->name = ctrl.name; //preserving the name
             {
                 ++it;
                 it->name = ctrl.name; //preserving the name
-                wxBitmap screenshot2(0, 0);
+                wxBitmap screenshot2(1, 1);
                 Capture(&screenshot2, *it);
                 Capture(&screenshot2, *it);
-                wxBitmap combined(0, 0);
+                wxBitmap combined(1, 1);
                 Union(&screenshot, &screenshot2, &combined);
                 screenshot = combined;
             }
                 Union(&screenshot, &screenshot2, &combined);
                 screenshot = combined;
             }
index 9984c21c97a43c611761f4216e3e4bfa7836db61..06871723d2bd411005b78e4f562be022843d0aa8 100644 (file)
@@ -279,13 +279,13 @@ public:
     /**
         Take a screenshot for the given region.
 
     /**
         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
         @param rect
-                       Given rectangular region.
+            Given rectangular region.
         @param delay
         @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);
 
     */
     static bool Capture(wxBitmap* bitmap, wxRect rect, int delay = 0);
 
index 308ab3cdc5539fe47a85efb631af08b27d0f8ead..5ff51958288b862c998ce8c3fe9eb84505f40997 100644 (file)
@@ -82,7 +82,7 @@ void ScreenshotFrame::OnCaptureFullScreen(wxCommandEvent& WXUNUSED(event))
     wxCoord screenWidth, screenHeight;
     dcScreen.GetSize(&screenWidth, &screenHeight);
 
     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"));
     AutoCaptureMechanism::Capture(&fullscreen, 0, 0, screenWidth, screenHeight);
 
     AutoCaptureMechanism::Save(&fullscreen, _T("fullscreen"));