The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / src / xrc / xh_bmpbt.cpp

diff --git a/src/xrc/xh_bmpbt.cpp b/src/xrc/xh_bmpbt.cpp
index b0500ed45e00e43635c530ce1fa58dfde5f415c7..81b805b116fffe94db56dfe1d8f7d61137126580 100644 (file)
--- a/src/xrc/xh_bmpbt.cpp
+++ b/src/xrc/xh_bmpbt.cpp
@@ -7,8 +7,8 @@
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2000 Brian Gavin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

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

 #pragma implementation "xh_bmpbt.h"
 #endif
 
 #pragma implementation "xh_bmpbt.h"
 #endif
 


@@ -19,27 +19,32 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_bmpbt.h"
 #include "wx/xrc/xh_bmpbt.h"

-#include <wx/bmpbuttn.h>
+#include "wx/bmpbuttn.h"

 
 

-wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler() 
-: wxXmlResourceHandler() 
+IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
+
+wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
+: wxXmlResourceHandler()

 {
     XRC_ADD_STYLE(wxBU_AUTODRAW);
     XRC_ADD_STYLE(wxBU_LEFT);
     XRC_ADD_STYLE(wxBU_RIGHT);
     XRC_ADD_STYLE(wxBU_TOP);
     XRC_ADD_STYLE(wxBU_BOTTOM);
 {
     XRC_ADD_STYLE(wxBU_AUTODRAW);
     XRC_ADD_STYLE(wxBU_LEFT);
     XRC_ADD_STYLE(wxBU_RIGHT);
     XRC_ADD_STYLE(wxBU_TOP);
     XRC_ADD_STYLE(wxBU_BOTTOM);

+    XRC_ADD_STYLE(wxBU_EXACTFIT);

     AddWindowStyles();
 }
 
 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
     AddWindowStyles();
 }
 
 wxObject *wxBitmapButtonXmlHandler::DoCreateResource()

-{ 
+{

     XRC_MAKE_INSTANCE(button, wxBitmapButton)
 
     button->Create(m_parentAsWindow,
                    GetID(),
     XRC_MAKE_INSTANCE(button, wxBitmapButton)
 
     button->Create(m_parentAsWindow,
                    GetID(),

-                   GetBitmap(wxT("bitmap")),
+                   GetBitmap(wxT("bitmap"), wxART_BUTTON),

                    GetPosition(), GetSize(),
                    GetStyle(wxT("style"), wxBU_AUTODRAW),
                    wxDefaultValidator,
                    GetPosition(), GetSize(),
                    GetStyle(wxT("style"), wxBU_AUTODRAW),
                    wxDefaultValidator,


@@ -47,14 +52,14 @@ wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
     SetupWindow(button);
     if (GetBool(wxT("default"), 0))
         button->SetDefault();
     SetupWindow(button);

-    
+

     if (!GetParamValue(wxT("selected")).IsEmpty())
         button->SetBitmapSelected(GetBitmap(wxT("selected")));
     if (!GetParamValue(wxT("focus")).IsEmpty())
         button->SetBitmapFocus(GetBitmap(wxT("focus")));
     if (!GetParamValue(wxT("disabled")).IsEmpty())
         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
     if (!GetParamValue(wxT("selected")).IsEmpty())
         button->SetBitmapSelected(GetBitmap(wxT("selected")));
     if (!GetParamValue(wxT("focus")).IsEmpty())
         button->SetBitmapFocus(GetBitmap(wxT("focus")));
     if (!GetParamValue(wxT("disabled")).IsEmpty())
         button->SetBitmapDisabled(GetBitmap(wxT("disabled")));

-    
+

     return button;
 }
 
     return button;
 }
 


@@ -62,3 +67,5 @@ bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxBitmapButton"));
 }
 {
     return IsOfClass(node, wxT("wxBitmapButton"));
 }

+
+#endif // wxUSE_XRC