Small build and run fixes made to screenshotgen util after wxMSW changes.

Updated wxOSX (Carbon) screenshots in the manual.


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

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;
             }

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);
 

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"));