Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hardware defines spec.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-29 08:03:26 +00:00
parent 927330abae
commit 9b1414681c
12 changed files with 57 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/chkconf.h
View File

@@ -1170,12 +1170,12 @@
#endif /* wxMGL */ #endif /* wxMGL */
/* Hopefully we can emulate these dialogs in due course */ /* Hopefully we can emulate these dialogs in due course */
#ifdef __SMARTPHONE__ #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
# ifdef wxUSE_COLOURDLG # ifdef wxUSE_COLOURDLG
# undef wxUSE_COLOURDLG # undef wxUSE_COLOURDLG
# define wxUSE_COLOURDLG 0 # define wxUSE_COLOURDLG 0
# endif # endif
#endif /* __SMARTPHONE__ */ #endif /* __SMARTPHONE__ && __WXWINCE__ */
/* generic controls dependencies */ /* generic controls dependencies */

2
include/wx/choice.h
View File

@@ -67,7 +67,7 @@ private:
#if defined(__WXUNIVERSAL__) #if defined(__WXUNIVERSAL__)
#include "wx/univ/choice.h" #include "wx/univ/choice.h"
#elif defined(__SMARTPHONE__) #elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/msw/wince/choicece.h" #include "wx/msw/wince/choicece.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/choice.h" #include "wx/msw/choice.h"

7
include/wx/dirdlg.h
View File

@@ -44,7 +44,6 @@ public:
// Universal and non-port related switches with need for generic implementation // Universal and non-port related switches with need for generic implementation
#if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \ #if defined(__WXMSW__) && (defined(__WXUNIVERSAL__) || \
defined(__SMARTPHONE__) || \
defined(__SALFORDC__) || \ defined(__SALFORDC__) || \
!wxUSE_OLE || \ !wxUSE_OLE || \
(defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS)) (defined (__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS))
@@ -52,6 +51,12 @@ public:
#include "wx/generic/dirdlgg.h" #include "wx/generic/dirdlgg.h"
#define wxDirDialog wxGenericDirDialog #define wxDirDialog wxGenericDirDialog
// MS Smartphone
#elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/generic/dirdlgg.h"
#define wxDirDialog wxGenericDirDialog
// Native MSW // Native MSW
#elif defined(__WXMSW__) #elif defined(__WXMSW__)

4
include/wx/msw/filedlg.h
View File

@@ -39,11 +39,11 @@ public:
protected: protected:
#ifndef __SMARTPHONE__ #if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoGetSize( int *width, int *height ) const; virtual void DoGetSize( int *width, int *height ) const;
virtual void DoGetPosition( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const;
#endif // __SMARTPHONE__ #endif // !(__SMARTPHONE__ && __WXWINCE__)
private: private:
wxArrayString m_fileNames; wxArrayString m_fileNames;

12
include/wx/msw/toplevel.h
View File

@@ -82,11 +82,11 @@ public:
void SetLastFocus(wxWindow *win) { m_winLastFocused = win; } void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
wxWindow *GetLastFocus() const { return m_winLastFocused; } wxWindow *GetLastFocus() const { return m_winLastFocused; }
#ifdef __SMARTPHONE__ #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL); virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL);
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
#endif // __SMARTPHONE__ #endif // __SMARTPHONE__ && __WXWINCE__
protected: protected:
// common part of all ctors // common part of all ctors
@@ -130,7 +130,7 @@ protected:
// the last focused child: we restore focus to it on activation // the last focused child: we restore focus to it on activation
wxWindow *m_winLastFocused; wxWindow *m_winLastFocused;
#ifdef __SMARTPHONE__ #if defined(__SMARTPHONE__) && defined(__WXWINCE__)
class ButtonMenu class ButtonMenu
{ {
public: public:
@@ -163,7 +163,7 @@ protected:
void ReloadButton(ButtonMenu& button, UINT menuID); void ReloadButton(ButtonMenu& button, UINT menuID);
void ReloadAllButtons(); void ReloadAllButtons();
#endif // __SMARTPHONE__ #endif // __SMARTPHONE__ && __WXWINCE__
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW) DECLARE_NO_COPY_CLASS(wxTopLevelWindowMSW)

2
include/wx/msw/wince/choicece.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/choicece.h // Name: wx/msw/wince/choicece.h
// Purpose: wxChoice implementation for Smartphones // Purpose: wxChoice implementation for smart phones driven by WinCE
// Author: Wlodzimierz ABX Skiba // Author: Wlodzimierz ABX Skiba
// Modified by: // Modified by:
// Created: 29.07.2004 // Created: 29.07.2004

4
include/wx/msw/wince/libraries.h
View File

@@ -21,7 +21,7 @@
// VC++'s #pragma to link against the libraries conditionally, instead of // VC++'s #pragma to link against the libraries conditionally, instead of
// including libraries in project files. // including libraries in project files.
#ifdef __VISUALC__ #if defined(__VISUALC__) && defined(__WXWINCE__)
#if _WIN32_WCE >= 400 #if _WIN32_WCE >= 400
#pragma comment(lib,"commdlg.lib") #pragma comment(lib,"commdlg.lib")
@@ -47,6 +47,6 @@
#error "Unknown SDK, please fill-in missing pieces" #error "Unknown SDK, please fill-in missing pieces"
#endif #endif
#endif // __VISUALC__ #endif // __VISUALC__ && __WXWINCE__
#endif // _WX_LIBRARIES_H_ #endif // _WX_LIBRARIES_H_

2
include/wx/msw/wince/smartphone.rc
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/smartphone.h // Name: wx/msw/wince/smartphone.h
// Purpose: resources for Smartphone build // Purpose: resources for MS Smartphone build
// Author: Wlodzimierz ABX Skiba // Author: Wlodzimierz ABX Skiba
// Modified by: // Modified by:
// Created: 01.05.2004 // Created: 01.05.2004

2
include/wx/msw/wince/textctrlce.h
View File

@@ -1,6 +1,6 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wince/textctrlce.h // Name: wx/msw/wince/textctrlce.h
// Purpose: wxTextCtrl class - Smartphone implementation // Purpose: wxTextCtrl implementation for smart phones driven by WinCE
// Author: Wlodzimierz ABX Skiba // Author: Wlodzimierz ABX Skiba
// Modified by: // Modified by:
// Created: 30.08.2004 // Created: 30.08.2004

44
include/wx/platform.h
View File

@@ -143,36 +143,45 @@
#endif /* Win32 */ #endif /* Win32 */
#if defined(__WXMSW__) || defined(__WIN32__) #if defined(__WXMSW__) || defined(__WIN32__)
# if !defined(__WINDOWS__) # if !defined(__WINDOWS__)
# define __WINDOWS__ # define __WINDOWS__
# endif # endif
#endif #endif
#ifdef __WINE__ #ifdef __WINE__
# ifndef __WIN95__ # ifndef __WIN95__
# define __WIN95__ # define __WIN95__
# endif # endif
#endif /* WINE */ #endif /* WINE */
/* detect SmartPhone */ /* detect MS SmartPhone */
#if defined( WIN32_PLATFORM_WFSP ) #if defined( WIN32_PLATFORM_WFSP )
# ifndef __SMARTPHONE__ # ifndef __SMARTPHONE__
# define __SMARTPHONE__ # define __SMARTPHONE__
# endif # endif
# ifndef __WXWINCE__
# define __WXWINCE__
# endif
#endif #endif
/* detect PocketPC */ /* detect PocketPC */
#if defined( WIN32_PLATFORM_PSPC ) #if defined( WIN32_PLATFORM_PSPC )
# ifndef __POCKETPC__ # ifndef __POCKETPC__
# define __POCKETPC__ # define __POCKETPC__
# endif # endif
# ifndef __WXWINCE__
# define __WXWINCE__
# endif
#endif #endif
/* detect Standard WinCE SDK */ /* detect Standard WinCE SDK */
#if defined( WCE_PLATFORM_STANDARDSDK ) #if defined( WCE_PLATFORM_STANDARDSDK )
# ifndef __WINCE_STANDARDSDK__ # ifndef __WINCE_STANDARDSDK__
# define __WINCE_STANDARDSDK__ # define __WINCE_STANDARDSDK__
# endif # endif
# ifndef __WXWINCE__
# define __WXWINCE__
# endif
#endif #endif
#if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC) #if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)
@@ -185,6 +194,9 @@
# define __HANDHELDPC__ # define __HANDHELDPC__
# endif # endif
# endif # endif
# ifndef __WXWINCE__
# define __WXWINCE__
# endif
#endif #endif
/* /*

2
include/wx/textctrl.h
View File

@@ -399,7 +399,7 @@ protected:
#include "wx/x11/textctrl.h" #include "wx/x11/textctrl.h"
#elif defined(__WXUNIVERSAL__) #elif defined(__WXUNIVERSAL__)
#include "wx/univ/textctrl.h" #include "wx/univ/textctrl.h"
#elif defined(__SMARTPHONE__) #elif defined(__SMARTPHONE__) && defined(__WXWINCE__)
#include "wx/msw/wince/textctrlce.h" #include "wx/msw/wince/textctrlce.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/textctrl.h" #include "wx/msw/textctrl.h"

5
include/wx/toplevel.h
View File

@@ -179,6 +179,11 @@ public:
virtual bool IsActive() virtual bool IsActive()
{ return (wxGetTopLevelParent(FindFocus()) == this); } { return (wxGetTopLevelParent(FindFocus()) == this); }
#if defined(__SMARTPHONE__)
virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
virtual void SetRightMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
#endif // __SMARTPHONE__
// implementation only from now on // implementation only from now on
// ------------------------------- // -------------------------------