move wxWindowGTK::DoPopupMenu back to window.cpp

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index cbe474153dd06e4957083c882b653ca8547fe5ae..bd81349e3651a940ebbc240af33d7db3d5050319 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -133,14 +133,13 @@ public:
     static void InitStandardHandlers();
     */
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk() const = 0;
-
     virtual int GetHeight() const = 0;
     virtual int GetWidth() const = 0;
     virtual int GetDepth() const = 0;
 
+#if wxUSE_IMAGE
     virtual wxImage ConvertToImage() const = 0;
+#endif // wxUSE_IMAGE
 
     virtual wxMask *GetMask() const = 0;
     virtual void SetMask(wxMask *mask) = 0;