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

Compile fixes for HANDHELDPC

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-06-11 19:15:40 +00:00
parent dcaf7c6e3b
commit 781a24e82f
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/listctrl.cpp
View File

@@ -45,7 +45,7 @@
#include "wx/msw/private.h" #include "wx/msw/private.h"
#if defined(__WXWINCE__) #if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
#include <ole2.h> #include <ole2.h>
#include <shellapi.h> #include <shellapi.h>
#if _WIN32_WCE < 400 #if _WIN32_WCE < 400
@@ -1720,7 +1720,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
event.m_col = nmHDR->iItem; event.m_col = nmHDR->iItem;
break; break;
#if defined(__WXWINCE__) && _WIN32_WCE < 400 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
case GN_CONTEXTMENU: case GN_CONTEXTMENU:
#endif //__WXWINCE__ #endif //__WXWINCE__
case NM_RCLICK: case NM_RCLICK:
@@ -1734,7 +1734,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// where did the click occur? // where did the click occur?
POINT ptClick; POINT ptClick;
#if defined(__WXWINCE__) && _WIN32_WCE < 400 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
if(nmhdr->code == GN_CONTEXTMENU) { if(nmhdr->code == GN_CONTEXTMENU) {
ptClick = ((NMRGINFO*)nmhdr)->ptAction; ptClick = ((NMRGINFO*)nmhdr)->ptAction;
} else } else
@@ -2054,7 +2054,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
event.m_item.m_data = GetItemData(iItem); event.m_item.m_data = GetItemData(iItem);
break; break;
#if defined(__WXWINCE__) && _WIN32_WCE < 400 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
case GN_CONTEXTMENU: case GN_CONTEXTMENU:
#endif //__WXWINCE__ #endif //__WXWINCE__
case NM_RCLICK: case NM_RCLICK:
@@ -2069,7 +2069,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
LV_HITTESTINFO lvhti; LV_HITTESTINFO lvhti;
wxZeroMemory(lvhti); wxZeroMemory(lvhti);
#if defined(__WXWINCE__) && _WIN32_WCE < 400 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
if(nmhdr->code == GN_CONTEXTMENU) { if(nmhdr->code == GN_CONTEXTMENU) {
lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction; lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
} else } else

5
src/msw/menu.cpp
View File

@@ -51,7 +51,7 @@
#include <ole2.h> #include <ole2.h>
#include <shellapi.h> #include <shellapi.h>
#include <commctrl.h> #include <commctrl.h>
#if _WIN32_WCE < 400 #if (_WIN32_WCE < 400) && !defined(__HANDHELDPC__)
#include <aygshell.h> #include <aygshell.h>
#endif #endif
@@ -763,7 +763,8 @@ WXHMENU wxMenuBar::Create()
// since you have to use resources. // since you have to use resources.
// We'll have to find another way to add a menu // We'll have to find another way to add a menu
// by changing/adding menu items to an existing menu. // by changing/adding menu items to an existing menu.
#if defined(__WXWINCE__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__)) #if defined(__WXWINCE__) && !defined(__HANDHELDPC__) \
(_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
if ( m_hMenu != 0 ) if ( m_hMenu != 0 )
return m_hMenu; return m_hMenu;

9
src/msw/wince/tbarwce.cpp
View File

@@ -56,7 +56,7 @@
#include <ole2.h> #include <ole2.h>
#include <shellapi.h> #include <shellapi.h>
#include <commctrl.h> #include <commctrl.h>
#if _WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__) #if !defined(__HANDHELDPC__) && ((_WIN32_WCE < 400) || defined(__POCKETPC__) || defined(__SMARTPHONE__))
#include <aygshell.h> #include <aygshell.h>
#endif #endif
#include "wx/msw/wince/missing.h" #include "wx/msw/wince/missing.h"
@@ -249,7 +249,7 @@ bool wxToolBar::MSWCreateToolbar(const wxPoint& pos, const wxSize& size, wxMenuB
if (m_menuBar) if (m_menuBar)
m_menuBar->SetToolBar(this); m_menuBar->SetToolBar(this);
#if _WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__) #if !defined(__HANDHELDPC__) && (_WIN32_WCE < 400 || defined(__POCKETPC__) || defined(__SMARTPHONE__))
// Create the menubar. // Create the menubar.
SHMENUBARINFO mbi; SHMENUBARINFO mbi;
@@ -368,12 +368,17 @@ wxSize wxToolBar::DoGetBestSize() const
// Return HMENU for the menu associated with the commandbar // Return HMENU for the menu associated with the commandbar
WXHMENU wxToolBar::GetHMenu() WXHMENU wxToolBar::GetHMenu()
{ {
#if defined(__HANDHELDPC__)
// TODO ???
return 0;
#else
if (GetHWND()) if (GetHWND())
{ {
return (WXHMENU) (HMENU)::SendMessage((HWND) GetHWND(), SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0); return (WXHMENU) (HMENU)::SendMessage((HWND) GetHWND(), SHCMBM_GETMENU, (WPARAM)0, (LPARAM)0);
} }
else else
return 0; return 0;
#endif
} }