New defines for wxTreeCtrl
Corrections to print preview MakeModal behaves sanely now. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
eebc8b5e75
commit
c25ccf85c1
@ -567,6 +567,11 @@ typedef void (*wxFunction) (wxObject&, wxEvent&);
|
|||||||
#define wxTR_EDIT_LABELS 0x0008
|
#define wxTR_EDIT_LABELS 0x0008
|
||||||
#define wxTR_LINES_AT_ROOT 0x0010
|
#define wxTR_LINES_AT_ROOT 0x0010
|
||||||
|
|
||||||
|
#define wxTR_SINGLE 0x0000
|
||||||
|
#define wxTR_MULTIPLE 0x0020
|
||||||
|
#define wxTR_EXTENDED 0x0040
|
||||||
|
#define wxTR_HAS_VARIABLE_ROW_HIGHT 0x0080
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* wxListCtrl flags
|
* wxListCtrl flags
|
||||||
*/
|
*/
|
||||||
|
@ -366,25 +366,26 @@ void wxPreviewControlBar::CreateButtons()
|
|||||||
x += gap + buttonWidth;
|
x += gap + buttonWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *choices[] =
|
|
||||||
{
|
|
||||||
"10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
|
|
||||||
"60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
|
|
||||||
"120%", "150%", "200%"
|
|
||||||
};
|
|
||||||
|
|
||||||
if (m_buttonFlags & wxPREVIEW_ZOOM)
|
if (m_buttonFlags & wxPREVIEW_ZOOM)
|
||||||
{
|
{
|
||||||
|
static const char *choices[] =
|
||||||
|
{
|
||||||
|
"10%", "15%", "20%", "25%", "30%", "35%", "40%", "45%", "50%", "55%",
|
||||||
|
"60%", "65%", "70%", "75%", "80%", "85%", "90%", "95%", "100%", "110%",
|
||||||
|
"120%", "150%", "200%"
|
||||||
|
};
|
||||||
|
|
||||||
m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
|
m_zoomControl = new wxChoice(this, wxID_PREVIEW_ZOOM,
|
||||||
wxPoint(x, y), wxSize(100, -1));
|
wxPoint(x, y), wxSize(100, -1));
|
||||||
|
|
||||||
|
// Yes, this look stupid, but this is because gcc gives up otherwise.
|
||||||
|
int n = WXSIZEOF(choices);
|
||||||
|
for ( int i = 0; i < n; i++ )
|
||||||
|
m_zoomControl->Append(choices[i]);
|
||||||
|
|
||||||
SetZoomControl(m_printPreview->GetZoom());
|
SetZoomControl(m_printPreview->GetZoom());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Yes, this look stupid, but this is because gcc gives up otherwise.
|
|
||||||
int n = WXSIZEOF(choices);
|
|
||||||
for ( int i = 0; i < n; i++ )
|
|
||||||
m_zoomControl->Append(choices[i]);
|
|
||||||
|
|
||||||
// m_closeButton->SetDefault();
|
// m_closeButton->SetDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -548,7 +549,7 @@ void wxPrintPreviewBase::Init(wxPrintout *printout,
|
|||||||
m_previewFrame = NULL;
|
m_previewFrame = NULL;
|
||||||
m_previewBitmap = NULL;
|
m_previewBitmap = NULL;
|
||||||
m_currentPage = 1;
|
m_currentPage = 1;
|
||||||
m_currentZoom = 30;
|
m_currentZoom = 70;
|
||||||
m_topMargin = 40;
|
m_topMargin = 40;
|
||||||
m_leftMargin = 40;
|
m_leftMargin = 40;
|
||||||
m_pageWidth = 0;
|
m_pageWidth = 0;
|
||||||
|
@ -745,15 +745,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
|
|||||||
void wxFrame::MakeModal( bool modal )
|
void wxFrame::MakeModal( bool modal )
|
||||||
{
|
{
|
||||||
if (modal)
|
if (modal)
|
||||||
{
|
|
||||||
gtk_grab_add( m_widget );
|
gtk_grab_add( m_widget );
|
||||||
gtk_main();
|
|
||||||
gtk_grab_remove( m_widget );
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
gtk_grab_remove( m_widget );
|
||||||
gtk_main_quit();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFrame::OnInternalIdle()
|
void wxFrame::OnInternalIdle()
|
||||||
|
@ -745,15 +745,9 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
|
|||||||
void wxFrame::MakeModal( bool modal )
|
void wxFrame::MakeModal( bool modal )
|
||||||
{
|
{
|
||||||
if (modal)
|
if (modal)
|
||||||
{
|
|
||||||
gtk_grab_add( m_widget );
|
gtk_grab_add( m_widget );
|
||||||
gtk_main();
|
|
||||||
gtk_grab_remove( m_widget );
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
gtk_grab_remove( m_widget );
|
||||||
gtk_main_quit();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxFrame::OnInternalIdle()
|
void wxFrame::OnInternalIdle()
|
||||||
|
Loading…
Reference in New Issue
Block a user