Changeset 53

Timestamp:

03/14/08 18:30:18 (7 months ago)

Author:

Chris Miller

Message:

Added to dfl.resources
Other minor changes

Files:

• trunk/win32/dfl/base.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (2 diffs)
• trunk/win32/dfl/drawing.d (modified) (3 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (1 diff)
• trunk/win32/dfl/listview.d (modified) (1 diff)
• trunk/win32/dfl/resources.d (modified) (6 diffs)
• trunk/win32/dfl/splitter.d (modified) (2 diffs)

trunk/win32/dfl/base.d

@@ -1222 +1222 @@
-    void dispose()
-    {
+        assert(owned);
-        DestroyCursor(hcur);
-        hcur = HCURSOR.init;

trunk/win32/dfl/control.d

@@ -1052 +1052 @@
-    
-    
+    /+
-    deprecated void anchor(AnchorStyles a) // setter
-    {
@@ -1071 +1072 @@
-        return cast(AnchorStyles)(AnchorStyles.LEFT | AnchorStyles.TOP);
-    }
+    +/
-    
-    

trunk/win32/dfl/drawing.d

@@ -1080 +1080 @@
-    void dispose()
-    {
+        assert(owned);
-        DeleteObject(hbm);
-        hbm = null;
@@ -2441 +2442 @@
-    void dispose()
-    {
+        assert(owned);
-        DeleteDC(hdc);
-        hdc = null;
@@ -2767 +2769 @@
-    void dispose()
-    {
+        assert(owned);
-        DestroyIcon(hi);
-        hi = null;

trunk/win32/dfl/internal/winapi.d

@@ -2793 +2793 @@
-    SHORT VkKeyScanW(wchar ch);
-    HRSRC FindResourceExA(HMODULE hModule, LPCSTR lpType, LPCSTR lpName, WORD wLanguage);
+    HRSRC FindResourceExW(HMODULE hModule, LPCWSTR lpType, LPCWSTR lpName, WORD wLanguage);
-    HGLOBAL LoadResource(HMODULE hModule, HRSRC hResInfo);
+    DWORD SizeofResource(HMODULE hModule, HRSRC hResInfo);
-    BOOL EnableMenuItem(HMENU hMenu, UINT uIDEnableItem, UINT uEnable);
-    BOOL IsMenu(HMENU hMenu);

trunk/win32/dfl/listview.d

@@ -2587 +2587 @@
-    {
-        //return _ins(index, cast(LPARAM)cast(void*)item, item.text, 0);
-
+
+
+
+
+
+
+
+
-    }
-    

trunk/win32/dfl/resources.d

@@ -45 +45 @@
-    void dispose()
-    {
+        assert(_owned);
-        //if(hinst != Application.getInstance()) // ?
-            FreeLibrary(hinst);
@@ -99 +100 @@
-    }
-    
-    /+
-    /// ditto
-    final Icon getIcon(int id, int width, int height)
@@ -132 +132 @@
-        return new Icon(hi, true); // Owned.
-    }
-    +/
-    
-    deprecated alias getIcon loadIcon;
@@ -205 +204 @@
-    body
-    {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        if(ws)
-        {
@@ -224 +215 @@
-            }
-            result = utf16stringtoUtf8string((ws + 1)[0 .. cast(size_t)*ws]);
-            //UnlockResource(ws); // Obsolete / stub.
-        }
-        FreeResource(hg); // Obsolete / stub.
-        return result;
-    }
-    
-    deprecated alias getString loadString;
+    
+    
+    // Used internally
+    final void[] _getData(LPCWSTR type, LPCWSTR name) // internal
+    {
+        HRSRC hrc;
+        hrc = FindResourceExW(hinst, type, name, lang);
+        if(!hrc)
+            return null;
+        HGLOBAL hg = LoadResource(hinst, hrc);
+        if(!hg)
+            return null;
+        LPVOID pv = LockResource(hg);
+        if(!pv)
+            return null;
+        return pv[0 .. SizeofResource(hinst, hrc)];
+    }
+    
+    ///
+    final void[] getData(int type, int id)
+    in
+    {
+        assert(type >= WORD.min && type <= WORD.max);
+        assert(id >= WORD.min && id <= WORD.max);
+    }
+    body
+    {
+        return _getData(cast(LPCWSTR)type, cast(LPCWSTR)id);
+    }
+    
+    /// ditto
+    final void[] getData(char[] type, int id)
+    in
+    {
+        assert(id >= WORD.min && id <= WORD.max);
+    }
+    body
+    {
+        return _getData(utf8stringToUtf16stringz(type), cast(LPCWSTR)id);
+    }
+    
+    /// ditto
+    final void[] getData(int type, char[] name)
+    in
+    {
+        assert(type >= WORD.min && type <= WORD.max);
+    }
+    body
+    {
+        return _getData(cast(LPCWSTR)type, utf8stringToUtf16stringz(name));
+    }
+    
+    /// ditto
+    final void[] getData(char[] type, char[] name)
+    {
+        return _getData(utf8stringToUtf16stringz(type), utf8stringToUtf16stringz(name));
+    }
-    
-    
@@ -247 +293 @@
-    
-    
-    /+
-    void _noload(char[] type)
-    {
-        throw new DflException("Unable to load " ~ type ~ " resource");
-    }
-    +/
-}
-

trunk/win32/dfl/splitter.d

@@ -81 +81 @@
-    
-    
+    /+
-    override void anchor(AnchorStyles a) // setter
-    {
@@ -87 +88 @@
-    
-    alias Control.anchor anchor; // Overload.
+    +/
-    
-