Use wxGetTranslation() instead of _() in the public headers.

[wxWidgets.git] / include / wx / x11 / bitmap.h

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index 8b5d956aca976a22e8e42b1b1bdb1c0faff036ce..23ac823faf4141c7bae2627315e984d956e3990e 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98
 // Author:      Julian Smart, Robert Roebling
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart, Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -88,6 +87,8 @@ public:
     bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
     bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
     bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
     bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
         { return Create(sz.GetWidth(), sz.GetHeight(), depth); }

+    bool Create(int width, int height, const wxDC& WXUNUSED(dc))
+        { return Create(width,height); }

 
     bool Create(const void* data, wxBitmapType type,
                 int width, int height, int depth = -1);
 
     bool Create(const void* data, wxBitmapType type,
                 int width, int height, int depth = -1);


@@ -117,7 +118,7 @@ public:
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const
 
     wxPalette *GetPalette() const;
     wxPalette *GetColourMap() const

-        { return GetPalette(); };
+        { return GetPalette(); }

     virtual void SetPalette(const wxPalette& palette);
 
     // implementation
     virtual void SetPalette(const wxPalette& palette);
 
     // implementation