Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed traces of wxFormBuilder from the screenshotgen utility, cleaned up some dependencies in headers, and replaced a few sparse tabs with spaces.

Browse Source 
Also applied patch #10083 (VC6 build fixes for screenshotgen).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2008-10-15 18:49:22 +00:00
parent d1b80f2196
commit f978831f37
11 changed files with 602 additions and 3623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
utils/screenshotgen/src/screenshot_main.cpp
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////
// Name: screenshot_main.cpp
// Purpose: Implement the Application Frame
// Purpose: Implements the window containing all controls.
// Author: Utensil Candel (UtensilCandel@@gmail.com)
// RCS-ID: $Id$
// Licence: wxWindows license
@@ -10,25 +10,17 @@
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#pragma hdrstop
#endif
// for all others, include the necessary headers
// for all others, include the necessary headers wxWidgets headers)
#ifndef WX_PRECOMP
#include <wx/filename.h>
#include <wx/dcbuffer.h>
#include <wx/colordlg.h>
#include <wx/fontdlg.h>
#include <wx/filedlg.h>
#include <wx/dirdlg.h>
#include "wx/wx.h"
#endif
#include <wx/dir.h>
#include <wx/aboutdlg.h>
#include <wx/msgdlg.h>
#include <wx/dcscreen.h>
#include <wx/filesys.h>
#include <wx/utils.h>
#include "wx/aboutdlg.h"
#include "wx/dir.h"
#include "wx/filesys.h"
#include "screenshot_main.h"
#include "ctrlmaskout.h"
@@ -74,13 +66,7 @@ ScreenshotFrame::~ScreenshotFrame()
}
/*
Do some further customization on some controls generated by wxFormBuilder.
wxFormBuilder does not allow customizations on some controls;
e.g. you cannot load a richtext file in a wxRichtextCtrl during initialization.
Those customizations will be done here.
Do some further customization on some controls.
NB: under wxGTK for the radio button "unchecked" to be unchecked, it's
important to put the wxRB_GROUP style on the first wxRadioButton
@@ -88,7 +74,6 @@ ScreenshotFrame::~ScreenshotFrame()
*/
void ScreenshotFrame::InitFBControls()
{
// For some reason, wxFormBuilder does not set the scrollbar range
m_scrollBar1->SetScrollbar(50, 1, 100, 1);
// Do the default selection for wxComboBox
@@ -107,24 +92,24 @@ void ScreenshotFrame::InitFBControls()
m_treeCtrl1->ExpandAll();
// Add items into wxListCtrl
m_listCtrl1->InsertColumn(0, "Names");
m_listCtrl1->InsertColumn(1, "Values");
for(long index = 0; index < 5; index++) {
m_listCtrl1->InsertColumn(0, "Names");
m_listCtrl1->InsertColumn(1, "Values");
for(long index = 0; index < 5; index++) {
m_listCtrl1->InsertItem( index, wxString::Format(_("Item%d"),index));
m_listCtrl1->SetItem(index, 1, wxString::Format("%d", index));
}
m_listCtrl1->SetItem(index, 1, wxString::Format("%d", index));
}
// Init file and dir pickers
wxString file, dir;
// Init file and dir pickers
wxString file, dir;
#if defined(__WXMSW__)
file = "C:\\Windows\\explorer.exe";
dir = "C:\\Windows";
file = "C:\\Windows\\explorer.exe";
dir = "C:\\Windows";
#else
file = "/bin/bash";
dir = "/home";
file = "/bin/bash";
dir = "/home";
#endif
m_filePicker1->SetPath(file);
m_dirPicker1->SetPath(dir);
m_filePicker1->SetPath(file);
m_dirPicker1->SetPath(dir);
// Check the first item in wxCheckListBox
m_checkList1->Check(0);