Lots of updates for color dialog and sliders

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

diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h
index 10f0464f383a09652f3466699040dc3971c6bc95..d7e9c0c376cc4469552d9e4df0a49dcd9ad02d44 100644 (file)
--- a/include/wx/os2/bitmap.h
+++ b/include/wx/os2/bitmap.h
@@ -74,7 +74,7 @@ public:
 
     // Copy constructors
     inline wxBitmap(const wxBitmap& rBitmap)
-      { Init(); Ref(rBitmap); }
+      { Init(); Ref(rBitmap); SetHandle(rBitmap.GetHandle()); }
 
     // Initialize with raw data
     wxBitmap( const char bits[]
@@ -223,14 +223,9 @@ public:
 
     inline bool IsMono(void) const { return m_bIsMono; }
 
-
     // An OS/2 version that probably doesn't do anything like the msw version
     wxBitmap GetBitmapForDC(wxDC& rDc) const;
 
-//    inline LONG GetId() const
-//      { return (GetBitmapData() ? GetBitmapData()->m_lId : 0L); }
-
-
 protected:
     // common part of all ctors
     void Init();

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index b45053a8622c38c4b5e787b5bb4d56b4eb3e3a27..0ab1d94d197103a26ad18949ee16ac291afacead 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -16,7 +16,7 @@
     #pragma interface "toplevel.h"
 #endif
 
-enum ETemplateID { kResizeableDialog = 127
+enum ETemplateID { kResizeableDialog = 130
                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };

diff --git a/include/wx/os2/wx.rc b/include/wx/os2/wx.rc
index 0c57c20e9c33e466a0c91124747a04a6da04f53f..287cf8fa99a6a2fc1ca5fe5c1307fe2c85d6d271 100644 (file)
--- a/include/wx/os2/wx.rc
+++ b/include/wx/os2/wx.rc
@@ -56,6 +56,9 @@ ICON       wxICON_SMALL_DRIVE            PRELOAD "\\dev\\wx2\\wxwindows\\include
 ICON       wxICON_SMALL_CDROM            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cdrom.ico"
 ICON       wxICON_SMALL_FLOPPY           PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\floppy.ico"
 ICON       wxICON_SMALL_REMOVEABLE       PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\removble.ico"
+ICON       wxICON_SMALL_ERROR            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\error.ico"
+ICON       wxICON_SMALL_INFO             PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\info.ico"
+ICON       wxICON_SMALL_WARNING          PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\warning.ico"
 
 /*
 //////////////////////////////////////////////////////////////////////////////

diff --git a/include/wx/os2/wxrsc.h b/include/wx/os2/wxrsc.h
index f840a49e246c354f3d0cfd78bec95bc9764b159e..e87843d15f503b4f90a4f11f9b1efd1d518a8ac8 100644 (file)
--- a/include/wx/os2/wxrsc.h
+++ b/include/wx/os2/wxrsc.h
@@ -27,22 +27,25 @@
 #define wxICON_SMALL_CDROM           119
 #define wxICON_SMALL_FLOPPY          120
 #define wxICON_SMALL_REMOVEABLE      121
+#define wxICON_SMALL_ERROR           122
+#define wxICON_SMALL_INFO            123
+#define wxICON_SMALL_WARNING         124
 
 /*
 // Bitmap Ids
 */
-#define wxDISABLE_BUTTON_BITMAP      122
-#define wxTICK_BITMAP                123
-#define wxCROSS_BITMAP               124
-#define wxCSQUERY_BITMAP             125
-#define wxBITMAP_STD_COLOURS         126
+#define wxDISABLE_BUTTON_BITMAP      125
+#define wxTICK_BITMAP                126
+#define wxCROSS_BITMAP               127
+#define wxCSQUERY_BITMAP             128
+#define wxBITMAP_STD_COLOURS         129
 
 /*
 // Dialog Ids -- must match enums in Toplevel.cpp
 */
-#define ID_RESIZEABLEDIALOG          127
-#define ID_CAPTIONDIALOG             128
-#define ID_NOCAPTIONDIALOG           129
+#define ID_RESIZEABLEDIALOG          130
+#define ID_CAPTIONDIALOG             131
+#define ID_NOCAPTIONDIALOG           132
 
-#define ID_WINDOW_MENU               130
+#define ID_WINDOW_MENU               133