Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

[wxWidgets.git] / include / wx / msw / wx.rc

diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc
index b1dc54050d40782112c633a3f728279a4fef51b5..da439acd9bf38d8b5f02093c9ec8a4fec6a75e15 100644 (file)
--- a/include/wx/msw/wx.rc
+++ b/include/wx/msw/wx.rc
@@ -98,12 +98,7 @@ wxICON_SMALL_REMOVEABLE         ICON "wx/msw/removble.ico"
 // Bitmaps
 //
 
 // Bitmaps
 //
 

-#ifdef __SALFORDC__
-wxDISABLE_BUTTON_BITMAP         BITMAP  WXINCDIR"wx/msw/disable.bmp"
-#else

 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"
 wxDISABLE_BUTTON_BITMAP         BITMAP  "wx/msw/disable.bmp"

-#endif
-

 
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"
 
 // For wxContextHelpButton
 csquery                 BITMAP "wx/msw/csquery.bmp"