More WinCE mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/fdrepdlg.h b/include/wx/fdrepdlg.h
index cc27bb97865900f7c8d901f705410781c5c911ba..f7b3d94185f9361217c89c4be7840ac05df6d081 100644 (file)
--- a/include/wx/fdrepdlg.h
+++ b/include/wx/fdrepdlg.h
@@ -129,7 +129,7 @@ protected:
 };
 
 // include wxFindReplaceDialog declaration
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__)
     #include "wx/msw/fdrepdlg.h"
 #else
     #define wxGenericFindReplaceDialog wxFindReplaceDialog

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index a8a5572e066eed9c81c3138bedd23d6aa64a5861..0c65857e38aff254bf9149eed873bbfee5c2d055 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -63,7 +63,8 @@ protected:
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------
 
-#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__)
+#if defined(__WXUNIVERSAL__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXCOCOA__) \
+    || defined(__WXWINCE__)
     #include "wx/generic/fontdlgg.h"
     #define wxFontDialog wxGenericFontDialog
     #define sm_classwxFontDialog sm_classwxGenericFontDialog

diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index c545d275ec321b5bf78d9bf0e08a75d39b3ce2d0..0daef6ee896e0b371d260bdf60c442074e09c5f3 100644 (file)
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -26,7 +26,9 @@ class WXDLLEXPORT wxBitmapRefData;
 class WXDLLEXPORT wxControl;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxDC;
+#if wxUSE_WXDIB
 class WXDLLEXPORT wxDIB;
+#endif
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxImage;
 class WXDLLEXPORT wxMask;
@@ -119,8 +121,10 @@ public:
     // copies the contents and mask of the given cursor to the bitmap
     bool CopyFromCursor(const wxCursor& cursor);
 
+#if wxUSE_WXDIB
     // copies from a device independent bitmap
     bool CopyFromDIB(const wxDIB& dib);
+#endif
 
     virtual bool Create(int width, int height, int depth = -1);
     virtual bool Create(int width, int height, const wxDC& dc);

diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h
index 6a2a40a02077f88e3d253f9f1ea55a929fa2e292..7f0d2ecb07a7de170be5e0bdea11482b950182f7 100644 (file)
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -17,6 +17,8 @@ class WXDLLEXPORT wxPalette;
 
 #include "wx/msw/private.h"
 
+#if wxUSE_WXDIB
+
 // ----------------------------------------------------------------------------
 // wxDIB: represents a DIB section
 // ----------------------------------------------------------------------------
@@ -225,5 +227,8 @@ inline wxDIB::~wxDIB()
     Free();
 }
 
+#endif
+    // wxUSE_WXDIB
+
 #endif // _WX_MSW_DIB_H_
 

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index 2416b22a68918ca3ad7041429ffece070c40b663..4b27759ebfbd27436f6ed0d17b076963d731fe92 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -149,6 +149,9 @@ private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
+#ifdef __WXWINCE__
+    WXHWND                m_commandBar;
+#endif
 
     // used by IconizeChildFrames(), see comments there
     bool m_wasMinimized;

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 41c090c5955cf1d038f9fc9cb6545ac3c827fcbd..3e5465eec32254df85bd303d0ed0fd30ad59384c 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -555,6 +555,9 @@ WXDLLEXPORT extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 // Get the size of an icon
 WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon);
 
+// Lines are drawn differently for WinCE and regular WIN32
+WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2);
+
 // LocalAlloc should be used on WinCE
 #ifdef __WXWINCE__
 #include <winbase.h>
@@ -563,7 +566,11 @@ WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon);
 #define GlobalFree LocalFree
 #define GlobalLock(mem) mem
 #define GlobalUnlock(mem)
+#define GlobalSize LocalSize
 #define GPTR LPTR
+#define GHND LPTR
+#define GMEM_MOVEABLE 0
+#define GMEM_SHARE 0
 
 #if 0
 

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 454b7120cd5fa539bb62ff452a601614fb8f9a1b..d130d0ca25e9e08beaa0c3a13f5ba87897bfcf7b 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -638,6 +638,9 @@
 // bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
 #define wxUSE_DIB_FOR_BITMAP 0
 
+// Set this to 1 to enable wxDIB
+#define wxUSE_WXDIB 1
+
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index a06174ec179fed0d8dfcbb7300683767d5866bbe..1c92f84b0778bd516cf209b7bbf7a1674d1ec7a8 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -144,7 +144,7 @@
 // Default is 1
 //
 // Recommended setting: 1 if your compiler supports it.
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && !defined(__WXWINCE__)
     #define wxUSE_ON_FATAL_EXCEPTION 1
 #else
     #define wxUSE_ON_FATAL_EXCEPTION 0
@@ -284,7 +284,7 @@
 // Default is 1
 //
 // Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
+#define wxUSE_FSVOLUME      0
 
 // use wxTextBuffer class: required by wxTextFile
 #define wxUSE_TEXTBUFFER    1
@@ -486,7 +486,7 @@
 #define wxUSE_BMPBUTTON    1    // wxBitmapButton
 #define wxUSE_CALENDARCTRL 1    // wxCalendarCtrl
 #define wxUSE_CHECKBOX     1    // wxCheckBox
-#define wxUSE_CHECKLISTBOX 1    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
+#define wxUSE_CHECKLISTBOX 0    // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox
 #define wxUSE_GAUGE        1    // wxGauge
@@ -642,6 +642,9 @@
 // bitmaps > 16MB on Win95/98/Me.  Set to 0 to use DDB's only.
 #define wxUSE_DIB_FOR_BITMAP 0
 
+// Set this to 1 to enable wxDIB
+#define wxUSE_WXDIB 1
+
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------
@@ -750,8 +753,8 @@
 // Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
 //
 // Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
+#define wxUSE_METAFILE              0
+#define wxUSE_ENH_METAFILE          0
 #define wxUSE_WIN_METAFILES_ALWAYS  0
 
 // ----------------------------------------------------------------------------
@@ -762,7 +765,7 @@
 #define wxUSE_DOC_VIEW_ARCHITECTURE 1
 
 // Set to 0 to disable MDI document/view architecture
-#define wxUSE_MDI_ARCHITECTURE    1
+#define wxUSE_MDI_ARCHITECTURE    0
 
 // Set to 0 to disable print/preview architecture code
 #define wxUSE_PRINTING_ARCHITECTURE  0
@@ -838,7 +841,7 @@
 
 #define wxUSE_DRAGIMAGE 1
 
-#define wxUSE_IPC         1
+#define wxUSE_IPC         0
                                 // 0 for no interprocess comms
 #define wxUSE_HELP        0
                                 // 0 for no help facility
@@ -1018,11 +1021,11 @@
 // Recommended setting: 1, only set it to 0 if your compiler doesn't have
 //                      or can't compile <richedit.h>
 #if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
-#define wxUSE_RICHEDIT  1
+#define wxUSE_RICHEDIT  0
 
 // TODO:  This should be ifdef'ed for any compilers that don't support
 //        RichEdit 2.0 but do have RichEdit 1.0...
-#define wxUSE_RICHEDIT2 1
+#define wxUSE_RICHEDIT2 0
 
 #else
 #define wxUSE_RICHEDIT  0
@@ -1035,7 +1038,7 @@
 // Default is 1.
 //
 // Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
+#define wxUSE_OWNER_DRAWN 0
 
 // Set to 1 to compile MS Windows XP theme engine support
 #define wxUSE_UXTHEME           0

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 3a761c91f3dd6af4965faeb259d003b30c141a18..e2782e7d557739971c6937dc818659afd621c121 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -357,5 +357,9 @@
     #define wxUSE_HOTKEY 0
 #endif
 
+#if !defined(wxUSE_WXDIB) && defined(__WXMSW__)
+    #define wxUSE_WXDIB 1
+#endif
+
 #endif /* _WX_PLATFORM_H_ */