| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved. | 2  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved. | 
| 3  * | 3  * | 
| 4  * Redistribution and use in source and binary forms, with or without | 4  * Redistribution and use in source and binary forms, with or without | 
| 5  * modification, are permitted provided that the following conditions | 5  * modification, are permitted provided that the following conditions | 
| 6  * are met: | 6  * are met: | 
| 7  * 1. Redistributions of source code must retain the above copyright | 7  * 1. Redistributions of source code must retain the above copyright | 
| 8  *    notice, this list of conditions and the following disclaimer. | 8  *    notice, this list of conditions and the following disclaimer. | 
| 9  * 2. Redistributions in binary form must reproduce the above copyright | 9  * 2. Redistributions in binary form must reproduce the above copyright | 
| 10  *    notice, this list of conditions and the following disclaimer in the | 10  *    notice, this list of conditions and the following disclaimer in the | 
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 84 | 84 | 
| 85 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS) | 85 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS) | 
| 86 | 86 | 
| 87     private: | 87     private: | 
| 88 #if USE(CROSS_PLATFORM_CONTEXT_MENUS) | 88 #if USE(CROSS_PLATFORM_CONTEXT_MENUS) | 
| 89         Vector<ContextMenuItem> m_items; | 89         Vector<ContextMenuItem> m_items; | 
| 90 #else | 90 #else | 
| 91 #if PLATFORM(MAC) | 91 #if PLATFORM(MAC) | 
| 92         // Keep this in sync with the PlatformMenuDescription typedef | 92         // Keep this in sync with the PlatformMenuDescription typedef | 
| 93         RetainPtr<NSMutableArray> m_platformDescription; | 93         RetainPtr<NSMutableArray> m_platformDescription; | 
| 94 #elif PLATFORM(QT) |  | 
| 95         QList<ContextMenuItem> m_items; |  | 
| 96 #elif PLATFORM(CHROMIUM) | 94 #elif PLATFORM(CHROMIUM) | 
| 97         Vector<ContextMenuItem> m_items; | 95         Vector<ContextMenuItem> m_items; | 
| 98 #else | 96 #else | 
| 99         PlatformMenuDescription m_platformDescription; | 97         PlatformMenuDescription m_platformDescription; | 
| 100 #if OS(WINCE) | 98 #if OS(WINCE) | 
| 101         unsigned m_itemCount; | 99         unsigned m_itemCount; | 
| 102 #endif | 100 #endif | 
| 103 #endif | 101 #endif | 
| 104 | 102 | 
| 105 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS) | 103 #endif // USE(CROSS_PLATFORM_CONTEXT_MENUS) | 
| 106     }; | 104     }; | 
| 107 | 105 | 
| 108 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS) | 106 #if !USE(CROSS_PLATFORM_CONTEXT_MENUS) | 
| 109 Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription); | 107 Vector<ContextMenuItem> contextMenuItemVector(PlatformMenuDescription); | 
| 110 PlatformMenuDescription platformMenuDescription(Vector<ContextMenuItem>&); | 108 PlatformMenuDescription platformMenuDescription(Vector<ContextMenuItem>&); | 
| 111 #endif | 109 #endif | 
| 112 | 110 | 
| 113 } | 111 } | 
| 114 | 112 | 
| 115 #endif // ENABLE(CONTEXT_MENUS) | 113 #endif // ENABLE(CONTEXT_MENUS) | 
| 116 #endif // ContextMenu_h | 114 #endif // ContextMenu_h | 
| OLD | NEW | 
|---|