init member variables properly (patch 1156088)

[wxWidgets.git] / include / wx / gtk1 / cursor.h

diff --git a/include/wx/gtk1/cursor.h b/include/wx/gtk1/cursor.h
index d274b6be95c24f6aeca538b9769ca67a85605170..5886b6e20f018d255dce45311483290d1a2530f6 100644 (file)
--- a/include/wx/gtk1/cursor.h
+++ b/include/wx/gtk1/cursor.h
@@ -11,7 +11,7 @@
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 
 #ifndef __GTKCURSORH__
 #define __GTKCURSORH__
 

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

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -19,28 +19,39 @@
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 
 #include "wx/object.h"
 #include "wx/gdicmn.h"
 

+#if wxUSE_IMAGE
+#include "wx/image.h"
+#endif
+

 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
 class wxCursor: public wxObject
 {
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------
 
 class wxCursor: public wxObject
 {

-  DECLARE_DYNAMIC_CLASS(wxCursor)
-
-  public:
+public:

 
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );
 
     wxCursor();
     wxCursor( int cursorId );
     wxCursor( const wxCursor &cursor );

+#if wxUSE_IMAGE
+    wxCursor( const wxImage & image );
+#endif
+    wxCursor( const char bits[], int width, int  height,
+              int hotSpotX=-1, int hotSpotY=-1,
+              const char maskBits[]=0, wxColour *fg=0, wxColour *bg=0 );

     ~wxCursor();
     wxCursor& operator = ( const wxCursor& cursor );
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 
     ~wxCursor();
     wxCursor& operator = ( const wxCursor& cursor );
     bool operator == ( const wxCursor& cursor ) const;
     bool operator != ( const wxCursor& cursor ) const;
     bool Ok() const;
 

+    // implementation
+

     GdkCursor *GetCursor() const;
 
     GdkCursor *GetCursor() const;
 

-    // no data :-)
+private:
+    DECLARE_DYNAMIC_CLASS(wxCursor)

 };
 
 #endif // __GTKCURSORH__
 };
 
 #endif // __GTKCURSORH__