projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make multiline checkboxes wider in wxMSW to avoid word wrap.
[wxWidgets.git]
/
src
/
motif
/
statbmp.cpp
diff --git
a/src/motif/statbmp.cpp
b/src/motif/statbmp.cpp
index 89a74c3792d27dfcc38404b36048635dffad6f55..eea9bd71b997d6c7e5fda8cd5bae826b57f0b93c 100644
(file)
--- a/
src/motif/statbmp.cpp
+++ b/
src/motif/statbmp.cpp
@@
-26,8
+26,6
@@
#include "wx/motif/private.h"
#include "wx/motif/private.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
/*
* wxStaticBitmap
*/
/*
* wxStaticBitmap
*/
@@
-61,9
+59,9
@@
bool wxStaticBitmap::Create(wxWindow *parent, wxWindowID id,
wxSize actualSize(size);
// work around the cases where the bitmap is a wxNull(Icon/Bitmap)
if (actualSize.x == -1)
wxSize actualSize(size);
// work around the cases where the bitmap is a wxNull(Icon/Bitmap)
if (actualSize.x == -1)
- actualSize.x = bitmap.Ok() ? bitmap.GetWidth() : 1;
+ actualSize.x = bitmap.
Is
Ok() ? bitmap.GetWidth() : 1;
if (actualSize.y == -1)
if (actualSize.y == -1)
- actualSize.y = bitmap.Ok() ? bitmap.GetHeight() : 1;
+ actualSize.y = bitmap.
Is
Ok() ? bitmap.GetHeight() : 1;
PostCreation();
DoSetBitmap();
PostCreation();
DoSetBitmap();
@@
-83,7
+81,7
@@
void wxStaticBitmap::DoSetBitmap()
Widget widget = (Widget) m_mainWidget;
int w2, h2;
Widget widget = (Widget) m_mainWidget;
int w2, h2;
- if (m_messageBitmapOriginal.Ok())
+ if (m_messageBitmapOriginal.
Is
Ok())
{
w2 = m_messageBitmapOriginal.GetWidth();
h2 = m_messageBitmapOriginal.GetHeight();
{
w2 = m_messageBitmapOriginal.GetWidth();
h2 = m_messageBitmapOriginal.GetHeight();