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

Made font/color fixes right for windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
J. Russell Smyth
1999-03-14 07:52:50 +00:00
parent 8a704c2b39
commit 49841b74a4
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
utils/framelayout/samples/demo/fl_demo.cpp
View File

@@ -232,10 +232,11 @@ void StartButton95::OnPaint( wxPaintEvent& event )
mDBmp.LoadFile( "start95_dp_icon", wxBITMAP_TYPE_BMP_RESOURCE ); mDBmp.LoadFile( "start95_dp_icon", wxBITMAP_TYPE_BMP_RESOURCE );
#endif #else
if ( !mDBmp.Ok() ) if ( !mDBmp.Ok() )
mDBmp = wxBitmap(start95_dp_xpm); mDBmp = wxBitmap(start95_dp_xpm);
#endif
pBmp = &mDBmp; pBmp = &mDBmp;
} }
@@ -1080,7 +1081,7 @@ void MyFrame::DropInSomeBars( int layoutNo )
pToolBar->Create( mpInternalFrm, -1 ); pToolBar->Create( mpInternalFrm, -1 );
// 1001-1006 ids of command events fired by added tool-buttons // 1001-1006 ids of command events fired by added tool-buttons
#ifdef __WXMSW__ #ifdef __WXMSW__
pToolBar->AddTool( 1001, wxBitmap("new_icon") ); pToolBar->AddTool( 1001, wxBitmap("new_icon") );
pToolBar->AddTool( 1002, wxBitmap("open_icon") ); pToolBar->AddTool( 1002, wxBitmap("open_icon") );
pToolBar->AddTool( 1003, wxBitmap("save_icon") ); pToolBar->AddTool( 1003, wxBitmap("save_icon") );

1
utils/framelayout/samples/demo/fl_demo.rc
View File

@@ -15,6 +15,7 @@ open_icon BITMAP "../bitmaps/open.bmp"
save_icon BITMAP "../bitmaps/save.bmp" save_icon BITMAP "../bitmaps/save.bmp"
saveall_icon BITMAP "../bitmaps/saveall.bmp" saveall_icon BITMAP "../bitmaps/saveall.bmp"
cut_icon BITMAP "../bitmaps/cut.bmp" cut_icon BITMAP "../bitmaps/cut.bmp"
new_icon BITMAP "../bitmaps/new.bmp"
copy_icon BITMAP "../bitmaps/copy.bmp" copy_icon BITMAP "../bitmaps/copy.bmp"
paste_icon BITMAP "../bitmaps/paste.bmp" paste_icon BITMAP "../bitmaps/paste.bmp"

4
utils/framelayout/src/controlarea.cpp
View File

@@ -506,7 +506,7 @@ wxFont wxTabbedWindow::GetLabelingFont()
return font; return font;
#endif #endif
return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT); return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
} }
void wxTabbedWindow::RecalcLayout(bool andRepaint) void wxTabbedWindow::RecalcLayout(bool andRepaint)
@@ -730,7 +730,7 @@ wxFont wxPaggedWindow::GetLabelingFont()
return font; return font;
#endif #endif
return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT); return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
} }
void wxPaggedWindow::OnTabAdded( twTabInfo* pInfo ) void wxPaggedWindow::OnTabAdded( twTabInfo* pInfo )

4
utils/framelayout/src/newbmpbtn.cpp
View File

@@ -402,7 +402,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
{ {
long txtWidth, txtHeight; long txtWidth, txtHeight;
srcDc.SetFont( wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT) ); srcDc.SetFont( wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT) );
srcDc.GetTextExtent( mLabelText, &txtWidth, &txtHeight ); srcDc.GetTextExtent( mLabelText, &txtWidth, &txtHeight );
if ( mTextAlignment == NB_ALIGN_TEXT_RIGHT ) if ( mTextAlignment == NB_ALIGN_TEXT_RIGHT )
@@ -480,7 +480,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
pTopWnd = pParent; pTopWnd = pParent;
} while(1); } while(1);
destDc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT) ); destDc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT) );
// Should be wxSYS_COLOUR_BTNTEXT, but gtk gives white? // Should be wxSYS_COLOUR_BTNTEXT, but gtk gives white?
destDc.SetTextForeground( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT) ); destDc.SetTextForeground( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT) );