Added some Motif wxGLCanvas support; some more Motif bugs cured; print dialogs
look OK on Motif now; got rid of some #ifdef wxUSE_... instances git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -312,6 +312,7 @@ void wxPreviewControlBar::CreateButtons()
|
||||
{
|
||||
SetSize(0, 0, 400, 40);
|
||||
|
||||
/*
|
||||
#ifdef __WXMSW__
|
||||
int fontSize = 9;
|
||||
#else
|
||||
@@ -320,6 +321,7 @@ void wxPreviewControlBar::CreateButtons()
|
||||
|
||||
wxFont buttonFont(fontSize, wxSWISS, wxNORMAL, wxBOLD);
|
||||
SetFont(buttonFont);
|
||||
*/
|
||||
|
||||
int buttonWidth = 65;
|
||||
#ifdef __WXGTK__
|
||||
@@ -330,7 +332,12 @@ void wxPreviewControlBar::CreateButtons()
|
||||
|
||||
int x = 5;
|
||||
int y = 5;
|
||||
|
||||
#ifdef __WXMOTIF__
|
||||
int gap = 15;
|
||||
#else
|
||||
int gap = 5;
|
||||
#endif
|
||||
|
||||
m_closeButton = new wxButton(this, wxID_PREVIEW_CLOSE, _("Close"),
|
||||
wxPoint(x, y), wxSize(buttonWidth, buttonHeight));
|
||||
@@ -394,7 +401,7 @@ void wxPreviewControlBar::CreateButtons()
|
||||
|
||||
delete[] choices;
|
||||
|
||||
m_closeButton->SetDefault();
|
||||
// m_closeButton->SetDefault();
|
||||
}
|
||||
|
||||
void wxPreviewControlBar::SetZoomControl(int zoom)
|
||||
|
Reference in New Issue
Block a user