applied patch 446836: removed qt headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -105,8 +105,6 @@ private:
 | 
				
			|||||||
    #include "wx/motif/accel.h"
 | 
					    #include "wx/motif/accel.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/accel.h"
 | 
					    #include "wx/gtk/accel.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/accel.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/accel.h"
 | 
					    #include "wx/mac/accel.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -331,8 +331,6 @@ protected:
 | 
				
			|||||||
        #include "wx/motif/app.h"
 | 
					        #include "wx/motif/app.h"
 | 
				
			||||||
    #elif defined(__WXMGL__)
 | 
					    #elif defined(__WXMGL__)
 | 
				
			||||||
        #include "wx/mgl/app.h"
 | 
					        #include "wx/mgl/app.h"
 | 
				
			||||||
    #elif defined(__WXQT__)
 | 
					 | 
				
			||||||
        #include "wx/qt/app.h"
 | 
					 | 
				
			||||||
    #elif defined(__WXGTK__)
 | 
					    #elif defined(__WXGTK__)
 | 
				
			||||||
        #include "wx/gtk/app.h"
 | 
					        #include "wx/gtk/app.h"
 | 
				
			||||||
    #elif defined(__WXMAC__)
 | 
					    #elif defined(__WXMAC__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -161,8 +161,6 @@ protected:
 | 
				
			|||||||
#include "wx/gtk/bitmap.h"
 | 
					#include "wx/gtk/bitmap.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/bitmap.h"
 | 
					#include "wx/mgl/bitmap.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/bitmap.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/bitmap.h"
 | 
					#include "wx/mac/bitmap.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -83,8 +83,6 @@ private:
 | 
				
			|||||||
    #include "wx/motif/bmpbuttn.h"
 | 
					    #include "wx/motif/bmpbuttn.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/bmpbuttn.h"
 | 
					    #include "wx/gtk/bmpbuttn.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/bmpbuttn.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/bmpbuttn.h"
 | 
					    #include "wx/mac/bmpbuttn.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/brush.h"
 | 
					#include "wx/gtk/brush.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/brush.h"
 | 
					#include "wx/mgl/brush.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/brush.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/brush.h"
 | 
					#include "wx/mac/brush.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -66,8 +66,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/button.h"
 | 
					    #include "wx/motif/button.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/button.h"
 | 
					    #include "wx/gtk/button.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/button.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/button.h"
 | 
					    #include "wx/mac/button.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,8 +40,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/checkbox.h"
 | 
					    #include "wx/motif/checkbox.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/checkbox.h"
 | 
					    #include "wx/gtk/checkbox.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/checkbox.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/checkbox.h"
 | 
					    #include "wx/mac/checkbox.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -36,8 +36,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/checklst.h"
 | 
					    #include "wx/motif/checklst.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/checklst.h"
 | 
					    #include "wx/gtk/checklst.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/checklst.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/checklst.h"
 | 
					    #include "wx/mac/checklst.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -69,8 +69,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/choice.h"
 | 
					    #include "wx/motif/choice.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/choice.h"
 | 
					    #include "wx/gtk/choice.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/choice.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/choice.h"
 | 
					    #include "wx/mac/choice.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -90,8 +90,6 @@ public:
 | 
				
			|||||||
    #include "wx/gtk/clipbrd.h"
 | 
					    #include "wx/gtk/clipbrd.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
    #include "wx/mgl/clipbrd.h"
 | 
					    #include "wx/mgl/clipbrd.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/gtk/clipbrd.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/clipbrd.h"
 | 
					    #include "wx/mac/clipbrd.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/colour.h"
 | 
					#include "wx/gtk/colour.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/colour.h"
 | 
					#include "wx/mgl/colour.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/colour.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/colour.h"
 | 
					#include "wx/mac/colour.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -59,8 +59,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/combobox.h"
 | 
					    #include "wx/motif/combobox.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/combobox.h"
 | 
					    #include "wx/gtk/combobox.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/combobox.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/combobox.h"
 | 
					    #include "wx/mac/combobox.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -82,8 +82,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/control.h"
 | 
					    #include "wx/motif/control.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/control.h"
 | 
					    #include "wx/gtk/control.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/control.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/control.h"
 | 
					    #include "wx/mac/control.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/cursor.h"
 | 
					#include "wx/gtk/cursor.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/cursor.h"
 | 
					#include "wx/mgl/cursor.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/cursor.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/cursor.h"
 | 
					#include "wx/mac/cursor.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -161,8 +161,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/dataobj.h"
 | 
					    #include "wx/motif/dataobj.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/dataobj.h"
 | 
					    #include "wx/gtk/dataobj.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/dnd.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/dataobj.h"
 | 
					    #include "wx/mac/dataobj.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -750,8 +750,6 @@ private:
 | 
				
			|||||||
    #include "wx/gtk/dc.h"
 | 
					    #include "wx/gtk/dc.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
    #include "wx/mgl/dc.h"
 | 
					    #include "wx/mgl/dc.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/dc.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/dc.h"
 | 
					    #include "wx/mac/dc.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/dcclient.h"
 | 
					#include "wx/gtk/dcclient.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/dcclient.h"
 | 
					#include "wx/mgl/dcclient.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/dcclient.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/dcclient.h"
 | 
					#include "wx/mac/dcclient.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/dcmemory.h"
 | 
					#include "wx/gtk/dcmemory.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/dcmemory.h"
 | 
					#include "wx/mgl/dcmemory.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/dcmemory.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/dcmemory.h"
 | 
					#include "wx/mac/dcmemory.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/dcscreen.h"
 | 
					#include "wx/gtk/dcscreen.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/dcscreen.h"
 | 
					#include "wx/mgl/dcscreen.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/dcscreen.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/dcscreen.h"
 | 
					#include "wx/mac/dcscreen.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,6 @@
 | 
				
			|||||||
#include "wx/motif/dde.h"
 | 
					#include "wx/motif/dde.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/dde.h"
 | 
					#include "wx/gtk/dde.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/dde.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/dde.h"
 | 
					#include "wx/mac/dde.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -273,7 +273,7 @@
 | 
				
			|||||||
    #error "Target can't be both X and Windows"
 | 
					    #error "Target can't be both X and Windows"
 | 
				
			||||||
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
 | 
					#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
 | 
				
			||||||
      !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
 | 
					      !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
 | 
				
			||||||
      !defined(__WXQT__) && !defined(__WXMGL__) && wxUSE_GUI
 | 
					      !defined(__WXMGL__) && wxUSE_GUI
 | 
				
			||||||
    #ifdef __UNIX__
 | 
					    #ifdef __UNIX__
 | 
				
			||||||
        #error "No Target! You should use wx-config program for compilation flags!"
 | 
					        #error "No Target! You should use wx-config program for compilation flags!"
 | 
				
			||||||
    #else // !Unix
 | 
					    #else // !Unix
 | 
				
			||||||
@@ -603,7 +603,6 @@ enum
 | 
				
			|||||||
    wxGTK_WIN32,              // GTK on Win32
 | 
					    wxGTK_WIN32,              // GTK on Win32
 | 
				
			||||||
    wxGTK_OS2,                // GTK on OS/2
 | 
					    wxGTK_OS2,                // GTK on OS/2
 | 
				
			||||||
    wxGTK_BEOS,               // GTK on BeOS
 | 
					    wxGTK_BEOS,               // GTK on BeOS
 | 
				
			||||||
    wxQT,                     // Qt
 | 
					 | 
				
			||||||
    wxGEOS,                   // GEOS
 | 
					    wxGEOS,                   // GEOS
 | 
				
			||||||
    wxOS2_PM,                 // OS/2 Workplace
 | 
					    wxOS2_PM,                 // OS/2 Workplace
 | 
				
			||||||
    wxWINDOWS,                // Windows or WfW
 | 
					    wxWINDOWS,                // Windows or WfW
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -55,8 +55,6 @@ protected:
 | 
				
			|||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
    #include "wx/mgl/dialog.h"
 | 
					    #include "wx/mgl/dialog.h"
 | 
				
			||||||
// FIXME_MGL -- belongs to wxUniv
 | 
					// FIXME_MGL -- belongs to wxUniv
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/dialog.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/dialog.h"
 | 
					    #include "wx/mac/dialog.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -21,8 +21,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 | 
				
			|||||||
#include "wx/generic/dirdlgg.h"
 | 
					#include "wx/generic/dirdlgg.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/generic/dirdlgg.h"
 | 
					#include "wx/generic/dirdlgg.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/dirdlg.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#ifdef __DARWIN__
 | 
					#ifdef __DARWIN__
 | 
				
			||||||
#include "wx/generic/dirdlgg.h"
 | 
					#include "wx/generic/dirdlgg.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -188,8 +188,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/dnd.h"
 | 
					    #include "wx/motif/dnd.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/dnd.h"
 | 
					    #include "wx/gtk/dnd.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/dnd.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/dnd.h"
 | 
					    #include "wx/mac/dnd.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,11 +22,6 @@
 | 
				
			|||||||
#define wxDragImage wxGenericDragImage
 | 
					#define wxDragImage wxGenericDragImage
 | 
				
			||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
 | 
					#define sm_classwxDragImage sm_classwxGenericDragImage
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/generic/dragimgg.h"
 | 
					 | 
				
			||||||
#define wxDragImage wxGenericDragImage
 | 
					 | 
				
			||||||
#define sm_classwxDragImage sm_classwxGenericDragImage
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/generic/dragimgg.h"
 | 
					#include "wx/generic/dragimgg.h"
 | 
				
			||||||
#define wxDragImage wxGenericDragImage
 | 
					#define wxDragImage wxGenericDragImage
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,8 +20,6 @@ enum
 | 
				
			|||||||
#include "wx/motif/filedlg.h"
 | 
					#include "wx/motif/filedlg.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/generic/filedlgg.h"
 | 
					#include "wx/generic/filedlgg.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/filedlg.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#ifdef __DARWIN__
 | 
					#ifdef __DARWIN__
 | 
				
			||||||
#include "wx/generic/filedlgg.h"
 | 
					#include "wx/generic/filedlgg.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -163,8 +163,6 @@ private:
 | 
				
			|||||||
    #include "wx/gtk/font.h"
 | 
					    #include "wx/gtk/font.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
    #include "wx/mgl/font.h"
 | 
					    #include "wx/mgl/font.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/font.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/font.h"
 | 
					    #include "wx/mac/font.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -86,8 +86,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/gauge.h"
 | 
					    #include "wx/motif/gauge.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/gauge.h"
 | 
					    #include "wx/gtk/gauge.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/gauge.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/gauge.h"
 | 
					    #include "wx/mac/gauge.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/gdiobj.h"
 | 
					#include "wx/gtk/gdiobj.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/gdiobj.h"
 | 
					#include "wx/mgl/gdiobj.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/gdiobj.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/gdiobj.h"
 | 
					#include "wx/mac/gdiobj.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,6 @@
 | 
				
			|||||||
#include "wx/motif/glcanvas.h"
 | 
					#include "wx/motif/glcanvas.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/glcanvas.h"
 | 
					#include "wx/gtk/glcanvas.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/glcanvas.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/glcanvas.h"
 | 
					#include "wx/mac/glcanvas.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -15,8 +15,6 @@
 | 
				
			|||||||
  #include "wx/gtk/icon.h"
 | 
					  #include "wx/gtk/icon.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
  #include "wx/mgl/icon.h"
 | 
					  #include "wx/mgl/icon.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
  #include "wx/qt/icon.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
  #include "wx/mac/icon.h"
 | 
					  #include "wx/mac/icon.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -133,8 +133,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/listbox.h"
 | 
					    #include "wx/motif/listbox.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/listbox.h"
 | 
					    #include "wx/gtk/listbox.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/listbox.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/listbox.h"
 | 
					    #include "wx/mac/listbox.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,6 @@
 | 
				
			|||||||
#include "wx/motif/mdi.h"
 | 
					#include "wx/motif/mdi.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/mdi.h"
 | 
					#include "wx/gtk/mdi.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/mdi.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/mdi.h"
 | 
					#include "wx/mac/mdi.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -451,8 +451,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/menu.h"
 | 
					    #include "wx/motif/menu.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/menu.h"
 | 
					    #include "wx/gtk/menu.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/menu.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/menu.h"
 | 
					    #include "wx/mac/menu.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -140,8 +140,6 @@ private:
 | 
				
			|||||||
    #include "wx/motif/menuitem.h"
 | 
					    #include "wx/motif/menuitem.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/menuitem.h"
 | 
					    #include "wx/gtk/menuitem.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/menuitem.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/menuitem.h"
 | 
					    #include "wx/mac/menuitem.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,8 +11,6 @@
 | 
				
			|||||||
#include "wx/motif/msgdlg.h"
 | 
					#include "wx/motif/msgdlg.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/generic/msgdlgg.h"
 | 
					#include "wx/generic/msgdlgg.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/generic/msgdlgg.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/msgdlg.h"
 | 
					#include "wx/mac/msgdlg.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -273,8 +273,6 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 | 
				
			|||||||
    #include  "wx/generic/notebook.h"
 | 
					    #include  "wx/generic/notebook.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include  "wx/gtk/notebook.h"
 | 
					    #include  "wx/gtk/notebook.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include  "wx/qt/notebook.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include  "wx/mac/notebook.h"
 | 
					    #include  "wx/mac/notebook.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/generic/paletteg.h"
 | 
					#include "wx/generic/paletteg.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/palette.h"
 | 
					#include "wx/mgl/palette.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/palette.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/palette.h"
 | 
					#include "wx/mac/palette.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/pen.h"
 | 
					#include "wx/gtk/pen.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/pen.h"
 | 
					#include "wx/mgl/pen.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/pen.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/pen.h"
 | 
					#include "wx/mac/pen.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,6 @@
 | 
				
			|||||||
#include "wx/generic/prntdlgg.h"
 | 
					#include "wx/generic/prntdlgg.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/generic/prntdlgg.h"
 | 
					#include "wx/generic/prntdlgg.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/generic/prntdlgg.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/printdlg.h"
 | 
					#include "wx/mac/printdlg.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -102,8 +102,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/radiobox.h"
 | 
					    #include "wx/motif/radiobox.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/radiobox.h"
 | 
					    #include "wx/gtk/radiobox.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/radiobox.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/radiobox.h"
 | 
					    #include "wx/mac/radiobox.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -41,8 +41,6 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
 | 
				
			|||||||
    #include "wx/motif/radiobut.h"
 | 
					    #include "wx/motif/radiobut.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/radiobut.h"
 | 
					    #include "wx/gtk/radiobut.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/radiobut.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/radiobut.h"
 | 
					    #include "wx/mac/radiobut.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -9,8 +9,6 @@
 | 
				
			|||||||
#include "wx/gtk/region.h"
 | 
					#include "wx/gtk/region.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/region.h"
 | 
					#include "wx/mgl/region.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/region.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/region.h"
 | 
					#include "wx/mac/region.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -46,8 +46,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/scrolbar.h"
 | 
					    #include "wx/motif/scrolbar.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/scrolbar.h"
 | 
					    #include "wx/gtk/scrolbar.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/scrolbar.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/scrolbar.h"
 | 
					    #include "wx/mac/scrolbar.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -114,8 +114,6 @@
 | 
				
			|||||||
#include "wx/gtk/settings.h"
 | 
					#include "wx/gtk/settings.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
#include "wx/mgl/settings.h"
 | 
					#include "wx/mgl/settings.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/settings.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/settings.h"
 | 
					#include "wx/mac/settings.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -11,8 +11,8 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
/* compatibility code, to be removed asap: */
 | 
					/* compatibility code, to be removed asap: */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
 | 
					#if !defined(__WXBASE__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
 | 
				
			||||||
#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
 | 
					#error No __WXxxx__ define set! Please define one of __WXBASE__,__WXMSW__,__WXGTK__,__WXMOTIF__,__WXSTUBS__,__WXMAC__,__WXPM__
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
@@ -40,13 +40,6 @@
 | 
				
			|||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/setup.h"
 | 
					#include "wx/mac/setup.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 | 
					 | 
				
			||||||
#include "wx/qtd/setup.h"
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#include "wx/qt/setup.h"
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#elif defined(__WXMOTIF__)
 | 
					#elif defined(__WXMOTIF__)
 | 
				
			||||||
#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 | 
					#if defined(__USE_WXCONFIG__) && defined(__WXDEBUG__)
 | 
				
			||||||
#include "wx/motifd/setup.h"
 | 
					#include "wx/motifd/setup.h"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -98,8 +98,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/slider.h"
 | 
					    #include "wx/motif/slider.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/slider.h"
 | 
					    #include "wx/gtk/slider.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/slider.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/slider.h"
 | 
					    #include "wx/mac/slider.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -82,8 +82,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/spinbutt.h"
 | 
					    #include "wx/motif/spinbutt.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/spinbutt.h"
 | 
					    #include "wx/gtk/spinbutt.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/spinbutt.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/spinbutt.h"
 | 
					    #include "wx/mac/spinbutt.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -54,8 +54,6 @@ protected:
 | 
				
			|||||||
    #include "wx/motif/statbmp.h"
 | 
					    #include "wx/motif/statbmp.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/statbmp.h"
 | 
					    #include "wx/gtk/statbmp.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/statbmp.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/statbmp.h"
 | 
					    #include "wx/mac/statbmp.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,8 +26,6 @@ public:
 | 
				
			|||||||
#include "wx/motif/statbox.h"
 | 
					#include "wx/motif/statbox.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/statbox.h"
 | 
					#include "wx/gtk/statbox.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/statbox.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/statbox.h"
 | 
					#include "wx/mac/statbox.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,8 +22,6 @@ public:
 | 
				
			|||||||
    #include "wx/motif/stattext.h"
 | 
					    #include "wx/motif/stattext.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/stattext.h"
 | 
					    #include "wx/gtk/stattext.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/stattext.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/stattext.h"
 | 
					    #include "wx/mac/stattext.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,6 @@
 | 
				
			|||||||
#elif defined(__WXMOTIF__)
 | 
					#elif defined(__WXMOTIF__)
 | 
				
			||||||
#include "wx/motif/taskbar.h"
 | 
					#include "wx/motif/taskbar.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/taskbar.h"
 | 
					#include "wx/mac/taskbar.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -273,8 +273,6 @@ private:
 | 
				
			|||||||
    #include "wx/motif/textctrl.h"
 | 
					    #include "wx/motif/textctrl.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/gtk/textctrl.h"
 | 
					    #include "wx/gtk/textctrl.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/textctrl.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/textctrl.h"
 | 
					    #include "wx/mac/textctrl.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -33,8 +33,6 @@ END_DECLARE_EVENT_TYPES()
 | 
				
			|||||||
/*
 | 
					/*
 | 
				
			||||||
# elif defined(__WXMOTIF__)
 | 
					# elif defined(__WXMOTIF__)
 | 
				
			||||||
#  include "wx/motif/tglbtn.h"
 | 
					#  include "wx/motif/tglbtn.h"
 | 
				
			||||||
# elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#  include "wx/qt/tglbtn.h"
 | 
					 | 
				
			||||||
# elif defined(__WXMAC__)
 | 
					# elif defined(__WXMAC__)
 | 
				
			||||||
#  include "wx/mac/tglbtn.h"
 | 
					#  include "wx/mac/tglbtn.h"
 | 
				
			||||||
# elif defined(__WXPM__)
 | 
					# elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -111,8 +111,6 @@ protected:
 | 
				
			|||||||
    #include "wx/gtk/timer.h"
 | 
					    #include "wx/gtk/timer.h"
 | 
				
			||||||
#elif defined(__WXMGL__)
 | 
					#elif defined(__WXMGL__)
 | 
				
			||||||
    #include "wx/mgl/timer.h"
 | 
					    #include "wx/mgl/timer.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/timer.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/mac/timer.h"
 | 
					    #include "wx/mac/timer.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -43,8 +43,6 @@
 | 
				
			|||||||
           #include "wx/motif/toolbar.h"
 | 
					           #include "wx/motif/toolbar.h"
 | 
				
			||||||
        #elif defined(__WXGTK__)
 | 
					        #elif defined(__WXGTK__)
 | 
				
			||||||
           #include "wx/gtk/tbargtk.h"
 | 
					           #include "wx/gtk/tbargtk.h"
 | 
				
			||||||
        #elif defined(__WXQT__)
 | 
					 | 
				
			||||||
           #include "wx/qt/tbarqt.h"
 | 
					 | 
				
			||||||
        #elif defined(__WXMAC__)
 | 
					        #elif defined(__WXMAC__)
 | 
				
			||||||
           #include "wx/mac/toolbar.h"
 | 
					           #include "wx/mac/toolbar.h"
 | 
				
			||||||
        #elif defined(__WXPM__)
 | 
					        #elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,8 +7,6 @@
 | 
				
			|||||||
// #include "wx/motif/tooltip.h"
 | 
					// #include "wx/motif/tooltip.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/tooltip.h"
 | 
					#include "wx/gtk/tooltip.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/tooltip.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/tooltip.h"
 | 
					#include "wx/mac/tooltip.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,8 +19,6 @@
 | 
				
			|||||||
    #include "wx/generic/treectlg.h"
 | 
					    #include "wx/generic/treectlg.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
    #include "wx/generic/treectlg.h"
 | 
					    #include "wx/generic/treectlg.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/treectrl.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #include "wx/generic/treectlg.h"
 | 
					    #include "wx/generic/treectlg.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,8 +5,6 @@
 | 
				
			|||||||
#include "wx/msw/wave.h"
 | 
					#include "wx/msw/wave.h"
 | 
				
			||||||
#elif defined(__WXGTK__)
 | 
					#elif defined(__WXGTK__)
 | 
				
			||||||
#include "wx/gtk/wave.h"
 | 
					#include "wx/gtk/wave.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
#include "wx/qt/wave.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
#include "wx/mac/wave.h"
 | 
					#include "wx/mac/wave.h"
 | 
				
			||||||
#elif defined(__WXPM__)
 | 
					#elif defined(__WXPM__)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1019,8 +1019,6 @@ private:
 | 
				
			|||||||
        #define sm_classwxWindowMGL sm_classwxWindow
 | 
					        #define sm_classwxWindowMGL sm_classwxWindow
 | 
				
			||||||
    #endif // wxUniv
 | 
					    #endif // wxUniv
 | 
				
			||||||
    #include "wx/mgl/window.h"
 | 
					    #include "wx/mgl/window.h"
 | 
				
			||||||
#elif defined(__WXQT__)
 | 
					 | 
				
			||||||
    #include "wx/qt/window.h"
 | 
					 | 
				
			||||||
#elif defined(__WXMAC__)
 | 
					#elif defined(__WXMAC__)
 | 
				
			||||||
    #ifdef __WXUNIVERSAL__
 | 
					    #ifdef __WXUNIVERSAL__
 | 
				
			||||||
        #define wxWindowNative wxWindowMac
 | 
					        #define wxWindowNative wxWindowMac
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,7 +16,7 @@ BuildRoot: /var/tmp/%{name}-root
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# all packages providing an implementation of wxWindows library (regardless of
 | 
					# all packages providing an implementation of wxWindows library (regardless of
 | 
				
			||||||
# the toolkit used) should provide the (virtual) wxwin package, this makes it
 | 
					# the toolkit used) should provide the (virtual) wxwin package, this makes it
 | 
				
			||||||
# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
 | 
					# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 | 
				
			||||||
Provides: wxwin
 | 
					Provides: wxwin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# in addition, we should provide libwx_gtk as automatic generator only notices
 | 
					# in addition, we should provide libwx_gtk as automatic generator only notices
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,7 +19,7 @@ BuildRoot: /tmp/wxmotif_root
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
# all packages providing an implementation of wxWindows library (regardless of
 | 
					# all packages providing an implementation of wxWindows library (regardless of
 | 
				
			||||||
# the toolkit used) should provide the (virtual) wxwin package, this makes it
 | 
					# the toolkit used) should provide the (virtual) wxwin package, this makes it
 | 
				
			||||||
# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxqt..."
 | 
					# possible to require wxwin instead of requiring "wxgtk or wxmotif or wxuniv..."
 | 
				
			||||||
Provides: wxwin
 | 
					Provides: wxwin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
%description
 | 
					%description
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user