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 862663ff30cbd2cefc7d3848537f2452bd9192fa..92add26604ca1b80f0658e3356a024adf9ec17c1 100644 (file)
--- 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),
   // 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__
 
   // 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 (file)
index 49bfa2a..0000000
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 (file)
index 0bf4ac5..0000000
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 (file)
index 5421808..0000000
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 (file)
index b4ffd72..0000000
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 (file)
index 877e24a..0000000
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 (file)
index b237b31..0000000
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 (file)
index 0d73619..0000000
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 (file)
index 3dbd4b0..0000000
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 (file)
index 7625c4e..0000000
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 (file)
index 0e2e2ba..0000000
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 (file)
index a32ec48..0000000
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 (file)
index 1788be8..0000000
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 (file)
index 0097156..0000000
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 (file)
index f7f235c..0000000
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 (file)
index 8062f7d..0000000
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 aa9618a3c604f2d1223748c2470381d5153ccb4e..a7b3dd59400cc81050e8a9d160b06cd03b65b8aa 100644 (file)
--- 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),
   // 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__
 
   // 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 99168339d91e23adb09aeecc6a1e085929dd411d..ef8ee7abc9c3f647f04158de9a5b34362d2f4017 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -482,6 +482,9 @@ bool wxListCtrl::GetItem(wxListItem& info) const
     lvItem.pszText = NULL;
   }
 
     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;
   if ( info.m_mask & wxLIST_MASK_STATE )
   {
     lvItem.mask |= LVIF_STATE;