attemps to make wxStreamToTextRedirector work with more (broken) compilers

[wxWidgets.git] / src / motif / bmpbuttn.cpp

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 54d735b85667f58e26dd5192150474784011d11a..00da6290faaccd19f3bf28c58e0fa0be75820a1a 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bmpbuttn.h"
 #endif
 
 #pragma implementation "bmpbuttn.h"
 #endif
 


@@ -35,48 +35,28 @@
 // Implemented in button.cpp
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 // Implemented in button.cpp
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 

-Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
+// Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );

 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 wxBitmapButton::wxBitmapButton()
 {
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 wxBitmapButton::wxBitmapButton()
 {

-    m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;

     m_insensPixmap = (WXPixmap) 0;
 }
 
     m_insensPixmap = (WXPixmap) 0;
 }
 

-bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+                            const wxBitmap& bitmap,

                             const wxPoint& pos,
                             const wxSize& size, long style,
                             const wxValidator& validator,
                             const wxString& name)
 {
                             const wxPoint& pos,
                             const wxSize& size, long style,
                             const wxValidator& validator,
                             const wxString& name)
 {

-    m_buttonBitmap = bitmap;
-    m_buttonBitmapOriginal = bitmap;
-    m_buttonBitmapSelected = bitmap;
-    m_buttonBitmapSelectedOriginal = bitmap;
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;

 
 

-    SetName(name);
-    SetValidator(validator);
-    parent->AddChild(this);
-
-    m_backgroundColour = parent->GetBackgroundColour() ;
-    m_foregroundColour = parent->GetForegroundColour() ;
-    m_windowStyle = style;
-    m_marginX = 0;
-    m_marginY = 0;
-
-    /*
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-    */
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    m_bmpNormal = m_bmpNormalOriginal = bitmap;
+    m_bmpSelected = m_bmpSelectedOriginal = bitmap;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -97,35 +77,29 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 #else
         xmPushButtonWidgetClass, parentWidget,
 #endif
 #else
         xmPushButtonWidgetClass, parentWidget,
 #endif

-        //                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+        // See comment for wxButton::SetDefault
+        // XmNdefaultButtonShadowThickness, 1, 
+        XmNrecomputeSize, False,

         NULL);
 
     m_mainWidget = (WXWidget) buttonWidget;
 
         NULL);
 
     m_mainWidget = (WXWidget) buttonWidget;
 

-    m_font = parent->GetFont();

     ChangeFont(FALSE);
 
     ChangeBackgroundColour ();
 
     DoSetBitmap();
 
     ChangeFont(FALSE);
 
     ChangeBackgroundColour ();
 
     DoSetBitmap();
 

-    XtAddCallback (buttonWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
-        (XtPointer) this);
+    XtAddCallback (buttonWidget,
+                   XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
+                   (XtPointer) this);

 
 

-    SetCanAddEventHandler(TRUE);
-    
-    wxSize newSize = size;
-    
-    if (m_buttonBitmap.Ok())
-    {
-        int border = (style & wxNO_BORDER) ? 4 : 10;
-        if (newSize.x == -1)
-            newSize.x = m_buttonBitmap.GetWidth()+border;
-        if (newSize.y == -1)
-            newSize.y = m_buttonBitmap.GetHeight()+border;
-    }
-    
-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, newSize.x, newSize.y);
+    wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;
+
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -135,42 +109,43 @@ wxBitmapButton::~wxBitmapButton()
     SetBitmapLabel(wxNullBitmap);
 
     if (m_insensPixmap)
     SetBitmapLabel(wxNullBitmap);
 
     if (m_insensPixmap)

-        XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()), (Pixmap) m_insensPixmap);
+        XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()),
+                         (Pixmap) m_insensPixmap);

 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {

-    m_buttonBitmapOriginal = bitmap;
-    m_buttonBitmap = bitmap;
+    m_bmpNormalOriginal = bitmap;
+    m_bmpNormal = bitmap;

 
     DoSetBitmap();
 }
 
 void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
 {
 
     DoSetBitmap();
 }
 
 void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
 {

-    m_buttonBitmapSelected = sel;
-    m_buttonBitmapSelectedOriginal = sel;
+    m_bmpSelected = sel;
+    m_bmpSelectedOriginal = sel;

 
     DoSetBitmap();
 };
 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {
 
     DoSetBitmap();
 };
 
 void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
 {

-    m_buttonBitmapFocus = focus;
+    m_bmpFocus = focus;

     // Not used in Motif
 };
 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {
     // Not used in Motif
 };
 
 void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
 {

-    m_buttonBitmapDisabled = disabled;
-    m_buttonBitmapDisabledOriginal = disabled;
+    m_bmpDisabled = disabled;
+    m_bmpDisabledOriginal = disabled;

 
     DoSetBitmap();
 };
 
 void wxBitmapButton::DoSetBitmap()
 {
 
     DoSetBitmap();
 };
 
 void wxBitmapButton::DoSetBitmap()
 {

-    if (m_buttonBitmapOriginal.Ok())
+    if (m_bmpNormalOriginal.Ok())

     {
         Pixmap pixmap = 0;
         Pixmap insensPixmap = 0;
     {
         Pixmap pixmap = 0;
         Pixmap insensPixmap = 0;


@@ -178,74 +153,77 @@ void wxBitmapButton::DoSetBitmap()
 
         // Must re-make the bitmap to have its transparent areas drawn
         // in the current widget background colour.
 
         // Must re-make the bitmap to have its transparent areas drawn
         // in the current widget background colour.

-        if (m_buttonBitmapOriginal.GetMask())
+        if (m_bmpNormalOriginal.GetMask())

         {
             int backgroundPixel;
         {
             int backgroundPixel;

-            XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
-                NULL);
+            XtVaGetValues((Widget) m_mainWidget,
+                          XmNbackground, &backgroundPixel,
+                          NULL);

 
             wxColour col;
             col.SetPixel(backgroundPixel);
 
 
             wxColour col;
             col.SetPixel(backgroundPixel);
 

-            wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col);
-            m_buttonBitmap = newBitmap;
+            wxBitmap newBitmap =
+                wxCreateMaskedBitmap(m_bmpNormalOriginal, col);
+            m_bmpNormal = newBitmap;
+            m_bitmapCache.SetBitmap( m_bmpNormal );

 
 

-            pixmap = (Pixmap) m_buttonBitmap.GetPixmap();
+            pixmap = (Pixmap) m_bmpNormal.GetDrawable();

         }
         else
         }
         else

-            pixmap = (Pixmap) m_buttonBitmap.GetLabelPixmap(m_mainWidget);
+        {
+            m_bitmapCache.SetBitmap( m_bmpNormal );
+            pixmap = (Pixmap) m_bitmapCache.GetLabelPixmap(m_mainWidget);
+        }

 
 

-        if (m_buttonBitmapDisabledOriginal.Ok())
+        if (m_bmpDisabledOriginal.Ok())

         {
         {

-            if (m_buttonBitmapDisabledOriginal.GetMask())
+            if (m_bmpDisabledOriginal.GetMask())

             {
                 int backgroundPixel;
             {
                 int backgroundPixel;

-                XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
-                    NULL);
+                XtVaGetValues((Widget) m_mainWidget,
+                              XmNbackground, &backgroundPixel,
+                              NULL);

 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 

-                wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col);
-                m_buttonBitmapDisabled = newBitmap;
+                wxBitmap newBitmap =
+                    wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
+                m_bmpDisabled = newBitmap;

 
 

-                insensPixmap = (Pixmap) m_buttonBitmapDisabled.GetPixmap();
+                insensPixmap = (Pixmap) m_bmpDisabled.GetDrawable();

             }
             else
             }
             else

-                insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget);
+                insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);

         }
         else
         }
         else

-            insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget);
+            insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);

 
         // Now make the bitmap representing the armed state
 
         // Now make the bitmap representing the armed state

-        if (m_buttonBitmapSelectedOriginal.Ok())
+        if (m_bmpSelectedOriginal.Ok())

         {
         {

-            if (m_buttonBitmapSelectedOriginal.GetMask())
+            if (m_bmpSelectedOriginal.GetMask())

             {
                 int backgroundPixel;
             {
                 int backgroundPixel;

-                XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel,
-                    NULL);
+                XtVaGetValues((Widget) m_mainWidget,
+                              XmNarmColor, &backgroundPixel,
+                              NULL);

 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 

-                wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapSelectedOriginal, col);
-                m_buttonBitmapSelected = newBitmap;
+                wxBitmap newBitmap =
+                    wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
+                m_bmpSelected = newBitmap;

 
 

-                armPixmap = (Pixmap) m_buttonBitmapSelected.GetPixmap();
+                armPixmap = (Pixmap) m_bmpSelected.GetDrawable();

             }
             else
             }
             else

-                armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
+                armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);

         }
         else
         }
         else

-            armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
-
-        if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap!
-        {
-            insensPixmap =
-                XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap);
-            m_insensPixmap = (WXPixmap) insensPixmap;
-        }
+            armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);

 
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelPixmap, pixmap,
 
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelPixmap, pixmap,


@@ -269,7 +247,7 @@ void wxBitmapButton::DoSetBitmap()
 
 void wxBitmapButton::ChangeBackgroundColour()
 {
 
 void wxBitmapButton::ChangeBackgroundColour()
 {

-    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+    wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);

 
     // Must reset the bitmaps since the colours have changed.
     DoSetBitmap();
 
     // Must reset the bitmaps since the colours have changed.
     DoSetBitmap();


@@ -279,16 +257,11 @@ wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize ret( 30,30 );
 
 {
     wxSize ret( 30,30 );
 

-    if (m_buttonBitmap.Ok())
+    if (m_bmpNormal.Ok())

     {
         int border = (GetWindowStyle() & wxNO_BORDER) ? 4 : 10;
     {
         int border = (GetWindowStyle() & wxNO_BORDER) ? 4 : 10;

-        ret.x = m_buttonBitmap.GetWidth()+border;
-        ret.y = m_buttonBitmap.GetHeight()+border;
-    }
-
-    if (!HasFlag(wxBU_EXACTFIT))
-    {
-        if (ret.x < 80) ret.x = 80;
+        ret.x = m_bmpNormal.GetWidth()+border;
+        ret.y = m_bmpNormal.GetHeight()+border;

     }
 
     return ret;
     }
 
     return ret;