projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added automatically-generated bitmaps of wxWidgets controls
[wxWidgets.git]
/
src
/
generic
/
prntdlgg.cpp
diff --git
a/src/generic/prntdlgg.cpp
b/src/generic/prntdlgg.cpp
index 1c6f62db68f9a2201bcd94fc2128a5c621b30314..c869dd68a173e8207c80216a94584686b0a71a11 100644
(file)
--- a/
src/generic/prntdlgg.cpp
+++ b/
src/generic/prntdlgg.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: prntdlgg.cpp
+// Name:
src/generic/
prntdlgg.cpp
// Purpose: Generic print dialogs
// Author: Julian Smart
// Modified by:
// Purpose: Generic print dialogs
// Author: Julian Smart
// Modified by:
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "prntdlgg.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-30,6
+26,8
@@
#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+#include "wx/generic/prntdlgg.h"
+
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dc.h"
#ifndef WX_PRECOMP
#include "wx/utils.h"
#include "wx/dc.h"
@@
-47,11
+45,9
@@
#endif
#if wxUSE_STATLINE
#endif
#if wxUSE_STATLINE
- #include "wx/statline.h"
+
#include "wx/statline.h"
#endif
#endif
-#include "wx/generic/prntdlgg.h"
-
#if wxUSE_POSTSCRIPT
#include "wx/generic/dcpsg.h"
#endif
#if wxUSE_POSTSCRIPT
#include "wx/generic/dcpsg.h"
#endif
@@
-66,6
+62,20
@@
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
#include <string.h>
+#ifndef __WXUNIVERSAL__
+
+#if wxUSE_LIBGNOMEPRINT
+ #include "wx/link.h"
+ wxFORCE_LINK_MODULE(gnome_print)
+#endif
+
+#if wxUSE_GTKPRINT
+ #include "wx/link.h"
+ wxFORCE_LINK_MODULE(gtk_print)
+#endif
+
+#endif // !wxUniv
+
// ----------------------------------------------------------------------------
// global vars
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// global vars
// ----------------------------------------------------------------------------
@@
-98,7
+108,7
@@
wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
#if !defined(__VMS__) && !defined(__WXMSW__)
m_printerCommand = wxT("lpr");
m_printerOptions = wxEmptyString;
#if !defined(__VMS__) && !defined(__WXMSW__)
m_printerCommand = wxT("lpr");
m_printerOptions = wxEmptyString;
- m_afmPath = wxEmptyString
)
;
+ m_afmPath = wxEmptyString;
#endif
m_printerScaleX = 1.0;
#endif
m_printerScaleX = 1.0;
@@
-135,8
+145,9
@@
END_EVENT_TABLE()
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintDialogData* data)
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintDialogData* data)
- : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
- wxPoint(0, 0), wxSize(600, 600),
+ : wxPrintDialogBase(GetParentForModalDialog(parent),
+ wxID_ANY, _("Print"),
+ wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
@@
-148,8
+159,9
@@
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintData* data)
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintData* data)
- : wxPrintDialogBase(parent, wxID_ANY, _("Print"),
- wxPoint(0, 0), wxSize(600, 600),
+ : wxPrintDialogBase(GetParentForModalDialog(parent),
+ wxID_ANY, _("Print"),
+ wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
@@
-161,7
+173,7
@@
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
{
void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
{
- // wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0,
0), wxSize(600, 600),
+ // wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600),
// wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
// wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
@@
-196,9
+208,9
@@
void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
if (factory->HasStatusLine())
{
flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
if (factory->HasStatusLine())
{
flex->Add( new wxStaticText( this, wxID_ANY, _("Status:") ),
- 0, wxALIGN_CENTER_VERTICAL|
wxALL-wxTOP
, 5 );
+ 0, wxALIGN_CENTER_VERTICAL|
(wxALL-wxTOP)
, 5 );
flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
flex->Add( new wxStaticText( this, wxID_ANY, factory->CreateStatusLine() ),
- 0, wxALIGN_CENTER_VERTICAL|
wxALL-wxTOP
, 5 );
+ 0, wxALIGN_CENTER_VERTICAL|
(wxALL-wxTOP)
, 5 );
}
mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
}
mainsizer->Add( topsizer, 0, wxLEFT|wxTOP|wxRIGHT|wxGROW, 10 );
@@
-245,14
+257,11
@@
void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
mainsizer->Add( bottomsizer, 0, wxTOP|wxLEFT|wxRIGHT, 12 );
-#if wxUSE_STATLINE
- // 4) static line
- mainsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
-#endif
+ // 4) buttons
- // 5) buttons
-
-
mainsizer->Add( CreateButtonSizer( wxOK|wxCANCEL)
, 0, wxEXPAND|wxALL, 10 );
+ wxSizer *sizerBtn = CreateSeparatedButtonSizer( wxOK|wxCANCEL);
+ if ( sizerBtn )
+
mainsizer->Add(sizerBtn
, 0, wxEXPAND|wxALL, 10 );
SetAutoLayout( true );
SetSizer( mainsizer );
SetAutoLayout( true );
SetSizer( mainsizer );
@@
-294,7
+303,7
@@
void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
wxFileDialog dialog( this, _("PostScript file"),
wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
wxFileDialog dialog( this, _("PostScript file"),
- fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wx
SAVE | wx
OVERWRITE_PROMPT );
+ fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wx
FD_SAVE | wxFD_
OVERWRITE_PROMPT );
if (dialog.ShowModal() != wxID_OK) return;
m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
if (dialog.ShowModal() != wxID_OK) return;
m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );
@@
-352,10
+361,12
@@
bool wxGenericPrintDialog::TransferDataToWindow()
if (m_printDialogData.GetToPage() > 0)
m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
if(m_rangeRadioBox)
if (m_printDialogData.GetToPage() > 0)
m_toText->SetValue(wxString::Format(_T("%d"), m_printDialogData.GetToPage()));
if(m_rangeRadioBox)
+ {
if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
m_rangeRadioBox->SetSelection(0);
else
m_rangeRadioBox->SetSelection(1);
if (m_printDialogData.GetAllPages() || m_printDialogData.GetFromPage() == 0)
m_rangeRadioBox->SetSelection(0);
else
m_rangeRadioBox->SetSelection(1);
+ }
}
else
{
}
else
{
@@
-442,13
+453,13
@@
BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog)
END_EVENT_TABLE()
wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
END_EVENT_TABLE()
wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
-wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,
0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
+wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
{
Init(data);
}
/* XPM */
{
Init(data);
}
/* XPM */
-static char * check_xpm[] = {
+static c
onst c
har * check_xpm[] = {
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
/* width height ncolors chars_per_pixel */
"16 16 3 1",
/* colors */
@@
-513,6
+524,8
@@
void wxGenericPrintSetupDialog::Init(wxPrintData* data)
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
+ // also select item
+ m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
item.SetId( 1+ item.GetId() );
}
item.SetId( 1+ item.GetId() );
@@
-533,8
+546,8
@@
void wxGenericPrintSetupDialog::Init(wxPrintData* data)
if (tmp != wxT("for"))
break; // the lpstat syntax must have changed.
tmp = tok.GetNextToken(); // "hp_deskjet930c:"
if (tmp != wxT("for"))
break; // the lpstat syntax must have changed.
tmp = tok.GetNextToken(); // "hp_deskjet930c:"
- if (tmp[tmp.
Len
()-1] == wxT(':'))
- tmp.Remove(tmp.
Len
()-1,1);
+ if (tmp[tmp.
length
()-1] == wxT(':'))
+ tmp.Remove(tmp.
length
()-1,1);
wxString name = tmp;
item.SetText( name );
item.SetId( m_printerListCtrl->InsertItem( item ) );
wxString name = tmp;
item.SetText( name );
item.SetId( m_printerListCtrl->InsertItem( item ) );
@@
-549,6
+562,8
@@
void wxGenericPrintSetupDialog::Init(wxPrintData* data)
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
item2.SetMask( wxLIST_MASK_IMAGE );
item2.SetImage( 0 );
m_printerListCtrl->SetItem( item2 );
+ // also select item
+ m_printerListCtrl->SetItemState( item.GetId(), wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED );
}
wxString command = wxT("lpstat -p ");
}
wxString command = wxT("lpstat -p ");
@@
-561,7
+576,7
@@
void wxGenericPrintSetupDialog::Init(wxPrintData* data)
tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..."
int pos = tmp.Find( wxT('.') );
if (pos != wxNOT_FOUND)
tmp = output2[0]; // "printer hp_deskjet930c is idle. enable since ..."
int pos = tmp.Find( wxT('.') );
if (pos != wxNOT_FOUND)
- tmp.Remove( (size_t)pos, tmp.
Len
()-(size_t)pos );
+ tmp.Remove( (size_t)pos, tmp.
length
()-(size_t)pos );
wxStringTokenizer tok2( tmp, wxT(" ") );
tmp = tok2.GetNextToken(); // "printer"
tmp = tok2.GetNextToken(); // "hp_deskjet930c"
wxStringTokenizer tok2( tmp, wxT(" ") );
tmp = tok2.GetNextToken(); // "printer"
tmp = tok2.GetNextToken(); // "hp_deskjet930c"
@@
-678,8
+693,7
@@
wxGenericPrintSetupDialog::~wxGenericPrintSetupDialog()
void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
{
// Delete check mark
void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
{
// Delete check mark
- long item;
- for (item = 0; item < m_printerListCtrl->GetItemCount(); item++)
+ for (long item = 0; item < m_printerListCtrl->GetItemCount(); item++)
m_printerListCtrl->SetItemImage( item, -1 );
m_printerListCtrl->SetItemImage( event.GetIndex(), 0 );
m_printerListCtrl->SetItemImage( item, -1 );
m_printerListCtrl->SetItemImage( event.GetIndex(), 0 );
@@
-690,14
+704,12
@@
void wxGenericPrintSetupDialog::OnPrinter(wxListEvent& event)
}
else
{
}
else
{
- wxString tmp = wxT("lpr -P");
- wxListItem item;
- item.SetColumn( 1 );
- item.SetMask( wxLIST_MASK_TEXT );
- item.SetId( event.GetIndex() );
- m_printerListCtrl->GetItem( item );
- tmp += item.GetText();
- m_printerCommandText->SetValue( tmp );
+ wxListItem li;
+ li.SetColumn( 1 );
+ li.SetMask( wxLIST_MASK_TEXT );
+ li.SetId( event.GetIndex() );
+ m_printerListCtrl->GetItem( li );
+ m_printerCommandText->SetValue( _T("lpr -P") + li.GetText() );
}
}
}
}
@@
-706,9
+718,9
@@
bool wxGenericPrintSetupDialog::TransferDataToWindow()
wxPostScriptPrintNativeData *data =
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
wxPostScriptPrintNativeData *data =
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
- if (m_printerCommandText &&
data->GetPrinterCommand
())
+ if (m_printerCommandText &&
!data->GetPrinterCommand().empty
())
m_printerCommandText->SetValue(data->GetPrinterCommand());
m_printerCommandText->SetValue(data->GetPrinterCommand());
- if (m_printerOptionsText &&
data->GetPrinterOptions
())
+ if (m_printerOptionsText &&
!data->GetPrinterOptions().empty
())
m_printerOptionsText->SetValue(data->GetPrinterOptions());
if (m_colourCheckBox)
m_colourCheckBox->SetValue(m_printData.GetColour());
m_printerOptionsText->SetValue(data->GetPrinterOptions());
if (m_colourCheckBox)
m_colourCheckBox->SetValue(m_printData.GetColour());
@@
-821,7
+833,7
@@
wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
: wxPageSetupDialogBase( parent,
wxID_ANY,
_("Page Setup"),
: wxPageSetupDialogBase( parent,
wxID_ANY,
_("Page Setup"),
- wxPoint(0,
0),
+ wxPoint(0,0),
wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{
wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{
@@
-1095,4
+1107,3
@@
void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
}
#endif
}
#endif
-
projects / wxWidgets.git / blobdiff