From: Julian Smart Date: Wed, 16 Dec 1998 16:23:20 +0000 (+0000) Subject: Removed some unnecessary bitmaps; other minor changes X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5f4987fed4dc52a35f0ddd649ae1cf9e75bb92d3?ds=sidebyside Removed some unnecessary bitmaps; other minor changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp index 862663ff30..92add26604 100644 --- a/samples/joytest/joytest.cpp +++ b/samples/joytest/joytest.cpp @@ -52,7 +52,7 @@ bool MyApp::OnInit(void) // Create the main frame window frame = new MyFrame(NULL, "Joystick Demo", wxPoint(0, 0), wxSize(500, 400), - wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL); + wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); // Give it an icon (this is ignored in MDI mode: uses resources) #ifdef __WXMSW__ diff --git a/samples/mdi/bitmaps/abacus.bmp b/samples/mdi/bitmaps/abacus.bmp deleted file mode 100644 index 49bfa2a84e..0000000000 Binary files a/samples/mdi/bitmaps/abacus.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/brush.bmp b/samples/mdi/bitmaps/brush.bmp deleted file mode 100644 index 0bf4ac5527..0000000000 Binary files a/samples/mdi/bitmaps/brush.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/chart.bmp b/samples/mdi/bitmaps/chart.bmp deleted file mode 100644 index 54218089a9..0000000000 Binary files a/samples/mdi/bitmaps/chart.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/colour.bmp b/samples/mdi/bitmaps/colour.bmp deleted file mode 100644 index b4ffd72550..0000000000 Binary files a/samples/mdi/bitmaps/colour.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/files.bmp b/samples/mdi/bitmaps/files.bmp deleted file mode 100644 index 877e24afc7..0000000000 Binary files a/samples/mdi/bitmaps/files.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/magnify.bmp b/samples/mdi/bitmaps/magnify.bmp deleted file mode 100644 index b237b31f8c..0000000000 Binary files a/samples/mdi/bitmaps/magnify.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/mike.bmp b/samples/mdi/bitmaps/mike.bmp deleted file mode 100644 index 0d736190e4..0000000000 Binary files a/samples/mdi/bitmaps/mike.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/page.bmp b/samples/mdi/bitmaps/page.bmp deleted file mode 100644 index 3dbd4b05b4..0000000000 Binary files a/samples/mdi/bitmaps/page.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/screw.bmp b/samples/mdi/bitmaps/screw.bmp deleted file mode 100644 index 7625c4e6b6..0000000000 Binary files a/samples/mdi/bitmaps/screw.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/shapes.bmp b/samples/mdi/bitmaps/shapes.bmp deleted file mode 100644 index 0e2e2ba043..0000000000 Binary files a/samples/mdi/bitmaps/shapes.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/speaker.bmp b/samples/mdi/bitmaps/speaker.bmp deleted file mode 100644 index a32ec48bba..0000000000 Binary files a/samples/mdi/bitmaps/speaker.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/telephon.bmp b/samples/mdi/bitmaps/telephon.bmp deleted file mode 100644 index 1788be8a72..0000000000 Binary files a/samples/mdi/bitmaps/telephon.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/therm.bmp b/samples/mdi/bitmaps/therm.bmp deleted file mode 100644 index 00971562ed..0000000000 Binary files a/samples/mdi/bitmaps/therm.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/torch.bmp b/samples/mdi/bitmaps/torch.bmp deleted file mode 100644 index f7f235c171..0000000000 Binary files a/samples/mdi/bitmaps/torch.bmp and /dev/null differ diff --git a/samples/mdi/bitmaps/wrench.bmp b/samples/mdi/bitmaps/wrench.bmp deleted file mode 100644 index 8062f7d0c3..0000000000 Binary files a/samples/mdi/bitmaps/wrench.bmp and /dev/null differ diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp index aa9618a3c6..a7b3dd5940 100644 --- a/samples/sashtest/sashtest.cpp +++ b/samples/sashtest/sashtest.cpp @@ -43,7 +43,7 @@ bool MyApp::OnInit(void) // Create the main frame window frame = new MyFrame(NULL, -1, "Sash Demo", wxPoint(0, 0), wxSize(500, 400), - wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL); + wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); // Give it an icon (this is ignored in MDI mode: uses resources) #ifdef __WXMSW__ diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index 99168339d9..ef8ee7abc9 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -482,6 +482,9 @@ bool wxListCtrl::GetItem(wxListItem& info) const lvItem.pszText = NULL; } + if (info.m_mask & wxLIST_MASK_DATA) + lvItem.mask |= LVIF_PARAM ; + if ( info.m_mask & wxLIST_MASK_STATE ) { lvItem.mask |= LVIF_STATE;