reverting to native mac pathnames

[wxWidgets.git] / include / wx / qt / window.h

diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index c024635909b099649d59f93209b93d633f818cbf..cac783dfc409537bab4fff75a5cb6b85c6750bb3 100644 (file)
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -52,7 +52,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;

-class WXDLLEXPORT wxRectangle;
+class WXDLLEXPORT wxRect;

 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;


@@ -66,11 +66,11 @@ class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxValidator;
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxValidator;
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

 class WXDLLEXPORT wxDropTarget;
 #endif
 
 class WXDLLEXPORT wxDropTarget;
 #endif
 

-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES

 class WXDLLEXPORT wxResourceTable;
 class WXDLLEXPORT wxItemResource;
 #endif
 class WXDLLEXPORT wxResourceTable;
 class WXDLLEXPORT wxItemResource;
 #endif


@@ -192,7 +192,7 @@ public:
   // Enable or disable the window
   virtual void Enable(bool enable);
 
   // Enable or disable the window
   virtual void Enable(bool enable);
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

   // Associate a drop target with this window (if the window already had a drop
   // target, it's deleted!) and return the current drop target (may be NULL).
   void          SetDropTarget(wxDropTarget *pDropTarget);
   // Associate a drop target with this window (if the window already had a drop
   // target, it's deleted!) and return the current drop target (may be NULL).
   void          SetDropTarget(wxDropTarget *pDropTarget);


@@ -227,7 +227,7 @@ public:
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event

-  virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+  virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);

 
   // New functions that will replace the above.
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
 
   // New functions that will replace the above.
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,


@@ -238,7 +238,7 @@ public:
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 

-  virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
+  virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);

 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);
 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);


@@ -329,7 +329,7 @@ public:
   virtual void OnDefaultAction(wxControl *initiatingItem);
 
   // Resource loading
   virtual void OnDefaultAction(wxControl *initiatingItem);
 
   // Resource loading

-#if USE_WX_RESOURCES
+#if wxUSE_WX_RESOURCES

   virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
   virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
 #endif
   virtual bool LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table = NULL);
   virtual wxControl *CreateItem(const wxItemResource *childResource, const wxResourceTable *table = NULL);
 #endif


@@ -480,7 +480,7 @@ protected:
   wxColour              m_defaultBackgroundColour;
   wxColour              m_defaultForegroundColour;
 
   wxColour              m_defaultBackgroundColour;
   wxColour              m_defaultForegroundColour;
 

-#if USE_DRAG_AND_DROP
+#if wxUSE_DRAG_AND_DROP

   wxDropTarget         *m_pDropTarget;    // the current drop target or NULL
 #endif  //USE_DRAG_AND_DROP
 
   wxDropTarget         *m_pDropTarget;    // the current drop target or NULL
 #endif  //USE_DRAG_AND_DROP