projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finally fixed control scrolling
[wxWidgets.git]
/
include
/
wx
/
rawbmp.h
diff --git
a/include/wx/rawbmp.h
b/include/wx/rawbmp.h
index db4c014d15af516d32e763bf620b5224702625df..d91754c8790a7fc59f20dbb1021341743a103408 100644
(file)
--- a/
include/wx/rawbmp.h
+++ b/
include/wx/rawbmp.h
@@
-164,7
+164,7
@@
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxImagePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
#define wxPIXEL_FORMAT_ALPHA 3
#elif defined(__WXGTK__)
- // Under GTK+ 2.X we use GdkPixbuf, which
should be
RGBA
+ // Under GTK+ 2.X we use GdkPixbuf, which
is standard RGB or
RGBA
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
typedef wxPixelFormat<unsigned char, 24, 0, 1, 2> wxNativePixelFormat;
#define wxPIXEL_FORMAT_ALPHA 3
@@
-520,6
+520,12
@@
struct wxPixelDataOut<wxBitmap>
bmp.GetRawData(data, PixelFormat::BitsPerPixel);
}
bmp.GetRawData(data, PixelFormat::BitsPerPixel);
}
+ // default constructor
+ Iterator()
+ {
+ m_ptr = NULL;
+ }
+
// return true if this iterator is valid
bool IsOk() const { return m_ptr != NULL; }
// return true if this iterator is valid
bool IsOk() const { return m_ptr != NULL; }