if (wxTheBitmapList)
wxTheBitmapList->AddBitmap(this);
-}
+} // end of wxBitmap::Init
bool wxBitmap::CopyFromIconOrCursor(
const wxGDIImage& rIcon
)
{
+ HPOINTER hIcon = (HPOINTER)rIcon.GetHandle();
+ POINTERINFO SIconInfo;
+
+ if (!::WinQueryPointerInfo(hIcon, &SIconInfo))
+ {
+ wxLogLastError(wxT("WinQueryPointerInfo"));
+ return FALSE;
+ }
wxBitmapRefData* pRefData = new wxBitmapRefData;
m_refData = pRefData;
- pRefData->m_nWidth = rIcon.GetWidth();
- pRefData->m_nHeight = rIcon.GetHeight();
- pRefData->m_nDepth = wxDisplayDepth();
+ int nWidth = rIcon.GetWidth();
+ int nHeight = rIcon.GetHeight();
- pRefData->m_hBitmap = (WXHBITMAP)rIcon.GetHandle();
- // no mask???
- pRefData->m_pBitmapMask = new wxMask();
+ pRefData->m_nWidth = nWidth;
+ pRefData->m_nHeight = nHeight;
+ pRefData->m_nDepth = wxDisplayDepth();
-#if WXWIN_COMPATIBILITY_2
- pRefData->m_bOk = TRUE;
-#endif // WXWIN_COMPATIBILITY_2
+ pRefData->m_hBitmap = (WXHBITMAP)SIconInfo.hbmColor;
+
+ //
+ // No mask in the Info struct in OS/2
+ //
return(TRUE);
-}
+} // end of wxBitmap::CopyFromIconOrCursor
bool wxBitmap::CopyFromCursor(
const wxCursor& rCursor
if (!rCursor.Ok())
return(FALSE);
return(CopyFromIconOrCursor(rCursor));
-}
+} // end of wxBitmap::CopyFromCursor
bool wxBitmap::CopyFromIcon(
const wxIcon& rIcon
return(FALSE);
return CopyFromIconOrCursor(rIcon);
-}
+} // end of wxBitmap::CopyFromIcon
wxBitmap::~wxBitmap()
{
if (wxTheBitmapList)
wxTheBitmapList->DeleteObject(this);
-}
+} // end of wxBitmap::~wxBitmap
wxBitmap::wxBitmap(
const char zBits[]
wxLogLastError("CreateBitmap");
}
SetHBITMAP((WXHBITMAP)hBmp);
-}
+} // end of wxBitmap::wxBitmap
+//
// Create from XPM data
+//
wxBitmap::wxBitmap(
char** ppData
-, wxControl* WXUNUSED(pAnItem))
+)
{
Init();
,0
,0
);
-}
+} // end of wxBitmap::wxBitmap
+
+wxBitmap::wxBitmap(
+ const char** ppData
+)
+{
+ Init();
+
+ (void)Create( (void *)ppData
+ ,wxBITMAP_TYPE_XPM_DATA
+ ,0
+ ,0
+ ,0
+ );
+} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
int nW
,nH
,nD
);
-}
+} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
void* pData
,nHeight
,nDepth
);
-}
+} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
const wxString& rFilename
LoadFile( rFilename
,(int)lType
);
-}
+} // end of wxBitmap::wxBitmap
bool wxBitmap::Create(
int nW
{
HBITMAP hBmp;
BITMAPINFOHEADER2 vHeader;
- BITMAPINFO2 vInfo;
- HPS hpsScreen;
- HDC hdcScreen;
- DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
- SIZEL vSize = {0, 0};
- LONG lBitCount;
wxASSERT(vHabmain != NULL);
-
- hpsScreen = ::WinGetScreenPS(HWND_DESKTOP);
- hdcScreen = ::GpiQueryDevice(hpsScreen);
- ::DevQueryCaps(hdcScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount);
-
- vHeader.cbFix = sizeof(vHeader);
- vHeader.cx = (USHORT)nW;
- vHeader.cy = (USHORT)nH;
- vHeader.cPlanes = (USHORT)nD;
- vHeader.cBitCount = lBitCount;
- vHeader.ulCompression = BCA_UNCOMP;
- vHeader.cxResolution = 0;
- vHeader.cyResolution = 0;
- vHeader.cclrUsed = 0;
- vHeader.cclrImportant = 0;
- vHeader.usUnits = BRU_METRIC;
- vHeader.usRecording = BRA_BOTTOMUP;
- vHeader.usRendering = BRH_NOTHALFTONED;
- vHeader.cSize1 = 0;
- vHeader.cSize2 = 0;
- vHeader.ulColorEncoding = 0;
- vHeader.ulIdentifier = 0;
-
UnRef();
m_refData = new wxBitmapRefData;
-
GetBitmapData()->m_nWidth = nW;
GetBitmapData()->m_nHeight = nH;
GetBitmapData()->m_nDepth = nD;
if (nD > 0)
{
- hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo);
- if (!hBmp)
- {
- wxLogLastError("CreateBitmap");
- }
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ SIZEL vSize = {0, 0};
+ HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
+
+ memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
+ vHeader.cbFix = sizeof(BITMAPINFOHEADER2);
+ vHeader.cx = nW;
+ vHeader.cy = nH;
+ vHeader.cPlanes = 1;
+ vHeader.cBitCount = nD;
+
+ hBmp = ::GpiCreateBitmap( hPS
+ ,&vHeader
+ ,0L
+ ,NULL
+ ,NULL
+ );
+ ::GpiDestroyPS(hPS);
+ ::DevCloseDC(hDC);
}
else
{
- LONG lPlanes;
+ HPS hPSScreen;
+ HDC hDCScreen;
+ LONG lBitCount;
+
+ hPSScreen = ::WinGetScreenPS(HWND_DESKTOP);
+ hDCScreen = ::GpiQueryDevice(hPSScreen);
+ ::DevQueryCaps(hDCScreen, CAPS_COLOR_BITCOUNT, 1L, &lBitCount);
+
+ memset(&vHeader, '\0', sizeof(BITMAPINFOHEADER2));
+ vHeader.cbFix = sizeof(BITMAPINFOHEADER2);
+ vHeader.cx = nW;
+ vHeader.cy = nH;
+ vHeader.cPlanes = 1;
+ vHeader.cBitCount = lBitCount;
+
+ hBmp = ::GpiCreateBitmap( hPSScreen
+ ,&vHeader
+ ,0L
+ ,NULL
+ ,NULL
+ );
- ::DevQueryCaps(hdcScreen, CAPS_COLOR_PLANES, 1L, &lPlanes);
- hBmp = ::GpiCreateBitmap(hpsScreen, &vHeader, 0L, NULL, &vInfo);
- if (!hBmp)
- {
- wxLogLastError("CreateBitmap");
- }
GetBitmapData()->m_nDepth = wxDisplayDepth();
+ ::WinReleasePS(hPSScreen);
}
SetHBITMAP((WXHBITMAP)hBmp);
#endif // WXWIN_COMPATIBILITY_2
return Ok();
-}
+} // end of wxBitmap::Create
bool wxBitmap::LoadFile(
const wxString& rFilename
return(TRUE);
}
-}
+} // end of wxBitmap::LoadFile
bool wxBitmap::Create(
void* pData
,nHeight
,nDepth
));
-}
+} // end of wxBitmap::Create
bool wxBitmap::SaveFile(
const wxString& rFilename
,lType
));
}
-}
+} // end of wxBitmap::SaveFile
+
+// ----------------------------------------------------------------------------
+// sub bitmap extraction
+// ----------------------------------------------------------------------------
+
+wxBitmap wxBitmap::GetSubBitmap(
+ const wxRect& rRect
+) const
+{
+ wxCHECK_MSG( Ok() &&
+ (rRect.x >= 0) && (rRect.y >= 0) &&
+ (rRect.x + rRect.width <= GetWidth()) &&
+ (rRect.y + rRect.height <= GetHeight()),
+ wxNullBitmap, wxT("Invalid bitmap or bitmap region") );
+
+ wxBitmap vRet( rRect.width
+ ,rRect.height
+ ,GetDepth()
+ );
+ wxASSERT_MSG( vRet.Ok(), wxT("GetSubBitmap error") );
+
+
+ //
+ // Copy bitmap data
+ //
+ SIZEL vSize = {0, 0};
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
+ HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
+ POINTL vPoint[4] = { rRect.x, rRect.y,
+ rRect.x + rRect.width, rRect.y + rRect.height,
+ 0, 0, GetWidth(), GetHeight()
+ };
+
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP());
+ ::GpiBitBlt( hPSDst
+ ,hPSSrc
+ ,4L
+ ,vPoint
+ ,ROP_SRCCOPY
+ ,BBO_IGNORE
+ );
+
+ //
+ // Copy mask if there is one
+ //
+ if (GetMask())
+ {
+ BITMAPINFOHEADER2 vBmih;
+
+ memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
+ vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
+ vBmih.cx = rRect.width;
+ vBmih.cy = rRect.height;
+ vBmih.cPlanes = 1;
+ vBmih.cBitCount = 1;
+
+ HBITMAP hBmpMask = ::GpiCreateBitmap( hPSDst
+ ,&vBmih
+ ,0L
+ ,NULL
+ ,NULL
+ );
+
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) GetHBITMAP());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) vRet.GetHBITMAP());
+
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) GetMask()->GetMaskBitmap());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) hBmpMask);
+ ::GpiBitBlt( hPSDst
+ ,hPSSrc
+ ,4L
+ ,vPoint
+ ,ROP_SRCCOPY
+ ,BBO_IGNORE
+ );
+
+ wxMask* pMask = new wxMask((WXHBITMAP)hBmpMask);
+ vRet.SetMask(pMask);
+ }
+
+ ::GpiSetBitmap(hPSSrc, NULL);
+ ::GpiSetBitmap(hPSDst, NULL);
+ ::GpiDestroyPS(hPSSrc);
+ ::GpiDestroyPS(hPSDst);
+ ::DevCloseDC(hDCSrc);
+ ::DevCloseDC(hDCDst);
+ return vRet;
+} // end of wxBitmap::GetSubBitmap
// ----------------------------------------------------------------------------
// wxBitmap accessors
EnsureHasData();
GetBitmapData()->m_nQuality = nQ;
-}
+} // end of wxBitmap::SetQuality
#if WXWIN_COMPATIBILITY_2
void wxBitmap::SetOk(
EnsureHasData();
GetBitmapData()->m_bOk = bOk;
-}
+} // end of wxBitmap::SetOk
#endif // WXWIN_COMPATIBILITY_2
void wxBitmap::SetPalette(
EnsureHasData();
GetBitmapData()->m_vBitmapPalette = rPalette;
-}
+} // end of wxBitmap::SetPalette
void wxBitmap::SetMask(
wxMask* pMask
EnsureHasData();
GetBitmapData()->m_pBitmapMask = pMask;
-}
+} // end of wxBitmap::SetMask
+//
// Will try something for OS/2 but not really sure how close
// to the msw intent this is.
+//
wxBitmap wxBitmap::GetBitmapForDC(
wxDC& rDc
) const
::GpiBitBlt(hPs, hMemoryPS, 4L, vPoint, ROP_SRCCOPY, BBO_IGNORE);
return(vTmpBitmap);
-}
+} // end of wxBitmap::GetBitmapForDC
// ----------------------------------------------------------------------------
// wxMask
wxMask::wxMask()
{
m_hMaskBitmap = 0;
-}
+} // end of wxMask::wxMask
// Construct a mask from a bitmap and a colour indicating
// the transparent area
Create( rBitmap
,rColour
);
-}
+} // end of wxMask::wxMask
// Construct a mask from a bitmap and a palette index indicating
// the transparent area
Create( rBitmap
,nPaletteIndex
);
-}
+} // end of wxMask::wxMask
// Construct a mask from a mono bitmap (copies the bitmap).
wxMask::wxMask(
{
m_hMaskBitmap = 0;
Create(rBitmap);
-}
+} // end of wxMask::wxMask
wxMask::~wxMask()
{
if (m_hMaskBitmap)
::GpiDeleteBitmap((HBITMAP)m_hMaskBitmap);
-}
+} // end of wxMask::~wxMask
// Create a mask from a mono bitmap (copies the bitmap).
bool wxMask::Create(
const wxBitmap& rBitmap
)
{
- BITMAPINFOHEADER2 vHeader;
- DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ BITMAPINFOHEADER2 vBmih;
SIZEL vSize = {0, 0};
- POINTL vPoint[4];
+ DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
+ HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
+ HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
+ POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(),
+ 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
+ };
if (m_hMaskBitmap)
{
{
return(FALSE);
}
- vHeader.cbFix = sizeof(vHeader);
- vHeader.cx = (USHORT)rBitmap.GetWidth();
- vHeader.cy = (USHORT)rBitmap.GetHeight();
- vHeader.cPlanes = 1;
- vHeader.cBitCount = 1;
-
- m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs
- ,&vHeader
- ,0L
- ,NULL
- ,NULL
- );
-
- HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
- ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP());
- HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
- ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap);
- // TODO: Set the point array
- ::GpiBitBlt(destPS, srcPS, 4L, vPoint, ROP_SRCCOPY , BBO_IGNORE);
-
- ::GpiDestroyPS(srcPS);
- ::GpiDestroyPS(destPS);
+
+ memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
+ vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
+ vBmih.cx = rBitmap.GetWidth();
+ vBmih.cy = rBitmap.GetHeight();
+ vBmih.cPlanes = 1;
+ vBmih.cBitCount = 1;
+
+ m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
+ ,&vBmih
+ ,0L
+ ,NULL
+ ,NULL
+ );
+
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap);
+ ::GpiBitBlt( hPSDst
+ ,hPSSrc
+ ,4L
+ ,vPoint
+ ,ROP_SRCCOPY
+ ,BBO_IGNORE
+ );
+
+ ::GpiDestroyPS(hPSSrc);
+ ::GpiDestroyPS(hPSDst);
+ ::DevCloseDC(hDCSrc);
+ ::DevCloseDC(hDCDst);
return(TRUE);
-}
+} // end of wxMask::Create
// Create a mask from a bitmap and a palette index indicating
// the transparent area
}
}
return(FALSE);
-}
+} // end of wxMask::Create
// Create a mask from a bitmap and a colour indicating
// the transparent area
, const wxColour& rColour
)
{
- BITMAPINFOHEADER2 vHeader;
- DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ bool bOk = TRUE;
+ COLORREF vMaskColour = OS2RGB( rColour.Red()
+ ,rColour.Green()
+ ,rColour.Blue()
+ );
+ BITMAPINFOHEADER2 vBmih;
SIZEL vSize = {0, 0};
- POINTL vPoint[4];
+ DEVOPENSTRUC vDop = { NULL, "DISPLAY", NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+ HDC hDCSrc = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HDC hDCDst = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
+ HPS hPSSrc = ::GpiCreatePS(vHabmain, hDCSrc, &vSize, PU_PELS | GPIA_ASSOC);
+ HPS hPSDst = ::GpiCreatePS(vHabmain, hDCDst, &vSize, PU_PELS | GPIA_ASSOC);
+ POINTL vPoint[4] = { 0 ,0, rBitmap.GetWidth(), rBitmap.GetHeight(),
+ 0, 0, rBitmap.GetWidth(), rBitmap.GetHeight()
+ };
if (m_hMaskBitmap)
{
return(FALSE);
}
- // scan the bitmap for the transparent colour and set
+ //
+ // Scan the bitmap for the transparent colour and set
// the corresponding pixels in the mask to BLACK and
// the rest to WHITE
- COLORREF vMaskColour = OS2RGB(rColour.Red(), rColour.Green(), rColour.Blue());
-
- vHeader.cbFix = sizeof(vHeader);
- vHeader.cx = (USHORT)rBitmap.GetWidth();
- vHeader.cy = (USHORT)rBitmap.GetHeight();
- vHeader.cPlanes = 1;
- vHeader.cBitCount = 1;
-
- m_hMaskBitmap = (WXHBITMAP) ::GpiCreateBitmap( m_hPs
- ,&vHeader
- ,0L
- ,NULL
- ,NULL
- );
-
- HPS srcPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
- ::GpiSetBitmap(srcPS, (HBITMAP)rBitmap.GetHBITMAP());
- HPS destPS = ::GpiCreatePS(vHabmain, m_hDc, &vSize, PU_PELS | GPIT_MICRO | GPIA_ASSOC);
- ::GpiSetBitmap(srcPS, (HBITMAP)m_hMaskBitmap);
-
- // this is not very efficient, but I can't think
+ //
+
+ memset(&vBmih, '\0', sizeof(BITMAPINFOHEADER2));
+ vBmih.cbFix = sizeof(BITMAPINFOHEADER2);
+ vBmih.cx = rBitmap.GetWidth();
+ vBmih.cy = rBitmap.GetHeight();
+ vBmih.cPlanes = 1;
+ vBmih.cBitCount = 1;
+
+ m_hMaskBitmap = ::GpiCreateBitmap( hPSDst
+ ,&vBmih
+ ,0L
+ ,NULL
+ ,NULL
+ );
+
+ ::GpiSetBitmap(hPSSrc, (HBITMAP) rBitmap.GetHBITMAP());
+ ::GpiSetBitmap(hPSDst, (HBITMAP) m_hMaskBitmap);
+
+ //
+ // This is not very efficient, but I can't think
// of a better way of doing it
+ //
for (int w = 0; w < rBitmap.GetWidth(); w++)
{
for (int h = 0; h < rBitmap.GetHeight(); h++)
{
- POINTL vPoint;
-
- vPoint.x = w;
- vPoint.y = h;
-
- COLORREF col = ::GpiQueryPel(srcPS, &vPoint);
+ POINTL vPt = {w, h};
+ COLORREF vCol = (COLORREF)::GpiQueryPel(hPSSrc, &vPt);
+ if (vCol == (COLORREF)CLR_NOINDEX)
+ {
+ //
+ // Doesn't make sense to continue
+ //
+ bOk = FALSE;
+ break;
+ }
- if (col == vMaskColour)
+ if (vCol == vMaskColour)
{
- ::GpiSetColor(destPS, CLR_WHITE);
- ::GpiSetPel(destPS, &vPoint);
+ ::GpiSetColor(hPSDst, OS2RGB(0, 0, 0));
+ ::GpiSetPel(hPSDst, &vPt);
}
else
{
- ::GpiSetColor(destPS, CLR_BLACK);
- ::GpiSetPel(destPS, &vPoint);
+ ::GpiSetColor(hPSDst, OS2RGB(255, 255, 255));
+ ::GpiSetPel(hPSDst, &vPt);
}
}
}
- ::GpiDestroyPS(srcPS);
- ::GpiDestroyPS(destPS);
+ ::GpiSetBitmap(hPSSrc, NULL);
+ ::GpiSetBitmap(hPSDst, NULL);
+ ::GpiDestroyPS(hPSSrc);
+ ::GpiDestroyPS(hPSDst);
+ ::DevCloseDC(hDCSrc);
+ ::DevCloseDC(hDCDst);
return(TRUE);
-}
+} // end of wxMask::Create
// ----------------------------------------------------------------------------
// wxBitmapHandler
#include <sys/types.h>
+#define INCL_DOSFILEMGR
+#include <os2.h>
+
#ifdef __EMX__
#include <dirent.h>
#endif
+// ----------------------------------------------------------------------------
+// define the types and functions used for file searching
+// ----------------------------------------------------------------------------
+
+typedef FILEFINDBUF3 FIND_STRUCT;
+typedef HDIR FIND_DATA;
+typedef ULONG FIND_ATTR;
+
+static inline FIND_DATA InitFindData() { return ERROR_INVALID_HANDLE; }
+
+static inline bool IsFindDataOk(
+ FIND_DATA vFd
+)
+{
+ return vFd != ERROR_INVALID_HANDLE;
+}
+
+static inline void FreeFindData(
+ FIND_DATA vFd
+)
+{
+ if (!::DosFindClose(vFd))
+ {
+ wxLogLastError(_T("DosFindClose"));
+ }
+}
+
+static inline FIND_DATA FindFirst(
+ const wxString& rsSpec
+, FIND_STRUCT* pFinddata
+)
+{
+ ULONG ulFindCount = 1;
+ FIND_DATA hDir;
+ FIND_ATTR rc;
+
+ rc = ::DosFindFirst( rsSpec.c_str()
+ ,&hDir
+ ,FILE_NORMAL
+ ,pFinddata
+ ,sizeof(FILEFINDBUF3)
+ ,&ulFindCount
+ ,FIL_STANDARD
+ );
+ if (rc != 0)
+ return 0;
+ return hDir;
+}
+
+static inline bool FindNext(
+ FIND_DATA vFd
+, FIND_STRUCT* pFinddata
+)
+{
+ ULONG ulFindCount = 1;
+
+ return ::DosFindNext( vFd
+ ,pFinddata
+ ,sizeof(FILEFINDBUF3)
+ ,&ulFindCount
+ ) != 0;
+}
+
+static const wxChar* GetNameFromFindData(
+ FIND_STRUCT* pFinddata
+)
+{
+ return pFinddata->achName;
+}
+
+static const FIND_ATTR GetAttrFromFindData(
+ FIND_STRUCT* pFinddata
+)
+{
+ return pFinddata->attrFile;
+}
+
+static inline bool IsDir(
+ FIND_ATTR vAttr
+)
+{
+ return (vAttr & FILE_DIRECTORY) != 0;
+}
+
+static inline bool IsHidden(
+ FIND_ATTR vAttr
+)
+{
+ return (vAttr & (FILE_HIDDEN | FILE_SYSTEM)) != 0;
+}
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+#ifndef MAX_PATH
+ #define MAX_PATH 260 // from PM++ headers
+#endif
+
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
class wxDirData
{
public:
- wxDirData(const wxString& dirname);
+ wxDirData(const wxString& rsDirname);
~wxDirData();
- bool IsOk() const { return m_dir != NULL; }
-
- void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
- void SetFlags(int flags) { m_flags = flags; }
+ void SetFileSpec(const wxString& rsFilespec) { m_sFilespec = rsFilespec; }
+ void SetFlags(int nFlags) { m_nFlags = nFlags; }
- void Rewind() { rewinddir(m_dir); }
- bool Read(wxString *filename);
+ void Close();
+ void Rewind();
+ bool Read(wxString* rsFilename);
private:
- DIR *m_dir;
-
- wxString m_dirname;
- wxString m_filespec;
-
- int m_flags;
-};
+ FIND_DATA m_vFinddata;
+ wxString m_sDirname;
+ wxString m_sFilespec;
+ int m_nFlags;
+}; // end of CLASS wxDirData
// ============================================================================
// implementation
// wxDirData
// ----------------------------------------------------------------------------
-wxDirData::wxDirData(const wxString& dirname)
- : m_dirname(dirname)
+wxDirData::wxDirData(
+ const wxString& rsDirname
+)
+: m_sDirname(rsDirname)
{
- m_dir = NULL;
-
- // throw away the trailing slashes
- size_t n = m_dirname.length();
- wxCHECK_RET( n, _T("empty dir name in wxDir") );
+ m_vFinddata = InitFindData();
+} // end of wxDirData::wxDirData
- while ( n > 0 && m_dirname[--n] == '/' )
- ;
+wxDirData::~wxDirData()
+{
+ Close();
+} // end of wxDirData::~wxDirData
- m_dirname.Truncate(n + 1);
+void wxDirData::Close()
+{
+ if ( IsFindDataOk(m_vFinddata) )
+ {
+ FreeFindData(m_vFinddata);
+ m_vFinddata = InitFindData();
+ }
+} // end of wxDirData::Close
- // do open the dir
- m_dir = opendir(m_dirname.fn_str());
-}
+void wxDirData::Rewind()
+{
+ Close();
+} // end of wxDirData::Rewind
-wxDirData::~wxDirData()
+bool wxDirData::Read(
+ wxString* psFilename
+)
{
- if ( m_dir )
+ bool bFirst = FALSE;
+
+ FILEFINDBUF3 vFinddata;
+ #define PTR_TO_FINDDATA (&vFinddata)
+
+ if (!IsFindDataOk(m_vFinddata))
{
- if ( closedir(m_dir) != 0 )
+ //
+ // Open first
+ //
+ wxString sFilespec = m_sDirname;
+
+ if ( !wxEndsWithPathSeparator(sFilespec) )
{
- wxLogLastError(_T("closedir"));
+ sFilespec += _T('\\');
}
+ sFilespec += (!m_sFilespec ? _T("*.*") : m_sFilespec.c_str());
+
+ m_vFinddata = FindFirst( sFilespec
+ ,PTR_TO_FINDDATA
+ );
+ bFirst = TRUE;
}
-}
-bool wxDirData::Read(wxString *filename)
-{
- dirent *de;
- bool matches = FALSE;
+ if ( !IsFindDataOk(m_vFinddata) )
+ {
+ return FALSE;
+ }
- while ( !matches )
+ const wxChar* zName;
+ FIND_ATTR vAttr;
+
+ for ( ;; )
{
- de = readdir(m_dir);
- if ( !de )
- return FALSE;
-
- // don't return "." and ".." unless asked for
- if ( de->d_name[0] == '.' &&
- ((de->d_name[1] == '.' && de->d_name[2] == '\0') ||
- (de->d_name[1] == '\0')) )
+ if (bFirst)
+ {
+ bFirst = FALSE;
+ }
+ else
{
- if ( !(m_flags & wxDIR_DOTDOT) )
+ if (!FindNext( m_vFinddata
+ ,PTR_TO_FINDDATA
+ ))
+ {
+ return FALSE;
+ }
+ }
+
+ zName = GetNameFromFindData(PTR_TO_FINDDATA);
+ vAttr = GetAttrFromFindData(PTR_TO_FINDDATA);
+
+ //
+ // Don't return "." and ".." unless asked for
+ //
+ if ( zName[0] == _T('.') &&
+ ((zName[1] == _T('.') && zName[2] == _T('\0')) ||
+ (zName[1] == _T('\0'))) )
+ {
+ if (!(m_nFlags & wxDIR_DOTDOT))
continue;
}
- // check the type now
- if ( !(m_flags & wxDIR_FILES) &&
- !wxDir::Exists(m_dirname + _T('/') + de->d_name) )
+ //
+ // Check the type now
+ //
+ if (!(m_nFlags & wxDIR_FILES) && !IsDir(vAttr))
{
- // it's a file, but we don't want them
+ //
+ // It's a file, but we don't want them
+ //
continue;
}
- else if ( !(m_flags & wxDIR_DIRS) &&
- wxDir::Exists(m_dirname + _T('/') + de->d_name) )
+ else if (!(m_nFlags & wxDIR_DIRS) && IsDir(vAttr) )
{
- // it's a dir, and we don't want it
+ //
+ // It's a dir, and we don't want it
+ //
continue;
}
- // finally, check the name
- if ( !m_filespec )
- {
- matches = m_flags & wxDIR_HIDDEN ? TRUE : de->d_name[0] != '.';
- }
- else
+ //
+ // Finally, check whether it's a hidden file
+ //
+ if (!(m_nFlags & wxDIR_HIDDEN))
{
- // test against the pattern
- matches = wxMatchWild(m_filespec, de->d_name,
- !(m_flags & wxDIR_HIDDEN));
+ if (IsHidden(vAttr))
+ {
+ //
+ // It's a hidden file, skip it
+ //
+ continue;
+ }
}
+ *psFilename = zName;
+ break;
}
-
- *filename = de->d_name;
-
return TRUE;
-}
+} // end of wxDirData::Read
// ----------------------------------------------------------------------------
// wxDir helpers
// ----------------------------------------------------------------------------
/* static */
-bool wxDir::Exists(const wxString& dir)
+bool wxDir::Exists(
+ const wxString& rsDir
+)
{
- return wxPathExists(dir);
-}
+ return wxPathExists(rsDir);
+} // end of wxDir::Exists
// ----------------------------------------------------------------------------
// wxDir construction/destruction
// ----------------------------------------------------------------------------
-wxDir::wxDir(const wxString& dirname)
+wxDir::wxDir(
+ const wxString& rsDirname
+)
{
m_data = NULL;
- (void)Open(dirname);
-}
+ (void)Open(rsDirname);
+} // end of wxDir::wxDir
-bool wxDir::Open(const wxString& dirname)
+bool wxDir::Open(
+ const wxString& rsDirname
+)
{
delete M_DIR;
- m_data = new wxDirData(dirname);
-
- if ( !M_DIR->IsOk() )
- {
- wxLogSysError(_("Can not enumerate files in directory '%s'"),
- dirname.c_str());
-
- delete M_DIR;
- m_data = NULL;
-
- return FALSE;
- }
-
+ m_data = new wxDirData(rsDirname);
return TRUE;
-}
+} // end of wxDir::Open
bool wxDir::IsOpened() const
{
return m_data != NULL;
-}
+} // end of wxDir::IsOpen
wxDir::~wxDir()
{
delete M_DIR;
-}
+} // end of wxDir::~wxDir
// ----------------------------------------------------------------------------
// wxDir enumerating
// ----------------------------------------------------------------------------
-bool wxDir::GetFirst(wxString *filename,
- const wxString& filespec,
- int flags) const
+bool wxDir::GetFirst(
+ wxString* psFilename
+, const wxString& rsFilespec
+, int nFlags
+) const
{
wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
-
M_DIR->Rewind();
-
- M_DIR->SetFileSpec(filespec);
- M_DIR->SetFlags(flags);
-
- return GetNext(filename);
-}
-
-bool wxDir::GetNext(wxString *filename) const
+ M_DIR->SetFileSpec(rsFilespec);
+ M_DIR->SetFlags(nFlags);
+ return GetNext(psFilename);
+} // end of wxDir::GetFirst
+
+bool wxDir::GetNext(
+ wxString* psFilename
+) const
{
wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( psFilename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+ return M_DIR->Read(psFilename);
+} // end of wxDir::GetNext
- wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
-
- return M_DIR->Read(filename);
-}
projects / wxWidgets.git / commitdiff
