Made font/color fixes right for windows

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/framelayout/samples/demo/fl_demo.cpp b/utils/framelayout/samples/demo/fl_demo.cpp
index 424913c47f2ceb169464bf9981dd33f78e8fdb7f..29c33308ba71aafe18c655a9285c2677a1bdda97 100644 (file)
--- a/utils/framelayout/samples/demo/fl_demo.cpp
+++ b/utils/framelayout/samples/demo/fl_demo.cpp
@@ -232,10 +232,11 @@ void StartButton95::OnPaint( wxPaintEvent& event )
                                    
             mDBmp.LoadFile( "start95_dp_icon", wxBITMAP_TYPE_BMP_RESOURCE );
 
-#endif
+#else
         if ( !mDBmp.Ok() )
                                    
             mDBmp = wxBitmap(start95_dp_xpm);
+#endif
 
         pBmp = &mDBmp;
     }
@@ -1080,7 +1081,7 @@ void MyFrame::DropInSomeBars( int layoutNo )
                pToolBar->Create( mpInternalFrm, -1 );
                                                                 
                // 1001-1006 ids of command events fired by added tool-buttons
-#ifdef __WXMSW__               
+#ifdef __WXMSW__               
                pToolBar->AddTool( 1001, wxBitmap("new_icon") );
                pToolBar->AddTool( 1002, wxBitmap("open_icon") );
                pToolBar->AddTool( 1003, wxBitmap("save_icon") );

diff --git a/utils/framelayout/samples/demo/fl_demo.rc b/utils/framelayout/samples/demo/fl_demo.rc
index 4acfb02372ab9054c879cedf29518f2b3b13ae72..3760eeec9e2dc76a732b603dfaca1272cadd0b04 100644 (file)
--- a/utils/framelayout/samples/demo/fl_demo.rc
+++ b/utils/framelayout/samples/demo/fl_demo.rc
@@ -15,6 +15,7 @@ open_icon BITMAP "../bitmaps/open.bmp"
 save_icon BITMAP "../bitmaps/save.bmp"
 saveall_icon BITMAP "../bitmaps/saveall.bmp"
 cut_icon BITMAP "../bitmaps/cut.bmp"
+new_icon BITMAP "../bitmaps/new.bmp"
 copy_icon BITMAP "../bitmaps/copy.bmp"
 paste_icon BITMAP "../bitmaps/paste.bmp"
 

diff --git a/utils/framelayout/src/controlarea.cpp b/utils/framelayout/src/controlarea.cpp
index 4f17a5234584e09f0b09715f2de81798b5864091..046131ce5c643607de55ab336913e6b4e02b54e7 100644 (file)
--- a/utils/framelayout/src/controlarea.cpp
+++ b/utils/framelayout/src/controlarea.cpp
@@ -506,7 +506,7 @@ wxFont wxTabbedWindow::GetLabelingFont()
 
        return font;
 #endif
-       return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT);
+       return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
 void wxTabbedWindow::RecalcLayout(bool andRepaint)
@@ -730,7 +730,7 @@ wxFont wxPaggedWindow::GetLabelingFont()
 
        return font;
 #endif
-       return wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT);
+       return wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
 }
 
 void wxPaggedWindow::OnTabAdded( twTabInfo* pInfo )

diff --git a/utils/framelayout/src/newbmpbtn.cpp b/utils/framelayout/src/newbmpbtn.cpp
index a96bc4438ad53832002d991c8e94c9bdefe51d85..617abfbf758287db0d5793843d30d915a50a83c5 100644 (file)
--- a/utils/framelayout/src/newbmpbtn.cpp
+++ b/utils/framelayout/src/newbmpbtn.cpp
@@ -402,7 +402,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
        {
                long txtWidth, txtHeight;
 
-               srcDc.SetFont( wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT) );
+               srcDc.SetFont( wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT) );
                srcDc.GetTextExtent( mLabelText, &txtWidth, &txtHeight );
 
                if ( mTextAlignment == NB_ALIGN_TEXT_RIGHT )
@@ -480,7 +480,7 @@ void wxNewBitmapButton::RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
                        pTopWnd = pParent;
                } 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?
                destDc.SetTextForeground( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_BTNTEXT) );