mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Move to GYP-based project file generation (issue #48).
- Add cef_create_projects.bat to generate the CEF project files. - Change include paths to be relative to the root CEF directory. - Add patch_build configuration and build.patch to modify the Chromium build system for required CEF dependencies. - Remove old .vcproj and .vsprops files. - Eliminate use of precompiled headers. - Commit generated project files (these will go away in the near future). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@50 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -5,9 +5,9 @@
|
||||
#ifndef _BASE_CTOCPP_H
|
||||
#define _BASE_CTOCPP_H
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "../cef_logging.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/cef_logging.h"
|
||||
|
||||
|
||||
// CefCToCpp implementation for CefBase.
|
||||
|
@@ -10,10 +10,9 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/handler_cpptoc.h"
|
||||
#include "ctocpp/browser_ctocpp.h"
|
||||
#include "ctocpp/frame_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
@@ -22,7 +21,7 @@ bool CefBrowser::CreateBrowser(CefWindowInfo& windowInfo, bool popup,
|
||||
CefRefPtr<CefHandler> handler, const std::wstring& url)
|
||||
{
|
||||
return cef_browser_create(&windowInfo, popup, CefHandlerCppToC::Wrap(handler),
|
||||
url.c_str());
|
||||
url.c_str())?true:false;
|
||||
}
|
||||
|
||||
CefRefPtr<CefBrowser> CefBrowser::CreateBrowserSync(CefWindowInfo& windowInfo,
|
||||
@@ -59,7 +58,7 @@ bool CefBrowserCToCpp::CanGoForward()
|
||||
if(CEF_MEMBER_MISSING(struct_, can_go_forward))
|
||||
return false;
|
||||
|
||||
return struct_->can_go_forward(struct_);
|
||||
return struct_->can_go_forward(struct_)?true:false;
|
||||
}
|
||||
|
||||
void CefBrowserCToCpp::GoForward()
|
||||
@@ -107,7 +106,7 @@ bool CefBrowserCToCpp::IsPopup()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_popup))
|
||||
return false;
|
||||
|
||||
return struct_->is_popup(struct_);
|
||||
return struct_->is_popup(struct_)?true:false;
|
||||
}
|
||||
|
||||
CefRefPtr<CefHandler> CefBrowserCToCpp::GetHandler()
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -5,9 +5,9 @@
|
||||
#ifndef _CTOCPP_H
|
||||
#define _CTOCPP_H
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "../cef_logging.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/cef_logging.h"
|
||||
|
||||
|
||||
// Wrap a C structure with a C++ class. This is used when the implementation
|
||||
|
@@ -10,10 +10,9 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/frame_ctocpp.h"
|
||||
#include "ctocpp/request_ctocpp.h"
|
||||
#include "ctocpp/stream_reader_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/frame_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/request_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/stream_reader_ctocpp.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
@@ -168,7 +167,7 @@ bool CefFrameCToCpp::IsMain()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_main))
|
||||
return false;
|
||||
|
||||
return struct_->is_main(struct_);
|
||||
return struct_->is_main(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefFrameCToCpp::IsFocused()
|
||||
@@ -176,7 +175,7 @@ bool CefFrameCToCpp::IsFocused()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_focused))
|
||||
return false;
|
||||
|
||||
return struct_->is_focused(struct_);
|
||||
return struct_->is_focused(struct_)?true:false;
|
||||
}
|
||||
|
||||
std::wstring CefFrameCToCpp::GetName()
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,14 +10,13 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/browser_cpptoc.h"
|
||||
#include "cpptoc/frame_cpptoc.h"
|
||||
#include "cpptoc/request_cpptoc.h"
|
||||
#include "cpptoc/stream_reader_cpptoc.h"
|
||||
#include "cpptoc/v8value_cpptoc.h"
|
||||
#include "ctocpp/handler_ctocpp.h"
|
||||
#include "../transfer_util.h"
|
||||
#include "libcef_dll/cpptoc/browser_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/frame_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/request_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/stream_reader_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/v8value_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/handler_ctocpp.h"
|
||||
#include "libcef_dll/transfer_util.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
@@ -10,9 +10,8 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/post_data_ctocpp.h"
|
||||
#include "ctocpp/post_data_element_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/post_data_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/post_data_element_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
@@ -58,7 +57,7 @@ bool CefPostDataCToCpp::RemoveElement(CefRefPtr<CefPostDataElement> element)
|
||||
return false;
|
||||
|
||||
return struct_->remove_element(struct_,
|
||||
CefPostDataElementCToCpp::Unwrap(element));
|
||||
CefPostDataElementCToCpp::Unwrap(element))?true:false;
|
||||
}
|
||||
|
||||
bool CefPostDataCToCpp::AddElement(CefRefPtr<CefPostDataElement> element)
|
||||
@@ -68,7 +67,7 @@ bool CefPostDataCToCpp::AddElement(CefRefPtr<CefPostDataElement> element)
|
||||
return false;
|
||||
|
||||
return struct_->add_element(struct_,
|
||||
CefPostDataElementCToCpp::Unwrap(element));
|
||||
CefPostDataElementCToCpp::Unwrap(element))?true:false;
|
||||
}
|
||||
|
||||
void CefPostDataCToCpp::RemoveElements()
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,8 +10,7 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/post_data_element_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/post_data_element_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,8 +10,7 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/read_handler_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/read_handler_ctocpp.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
@@ -10,10 +10,9 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/post_data_ctocpp.h"
|
||||
#include "ctocpp/request_ctocpp.h"
|
||||
#include "../transfer_util.h"
|
||||
#include "libcef_dll/ctocpp/post_data_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/request_ctocpp.h"
|
||||
#include "libcef_dll/transfer_util.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,10 +10,9 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/request_cpptoc.h"
|
||||
#include "ctocpp/scheme_handler_ctocpp.h"
|
||||
#include "../transfer_util.h"
|
||||
#include "libcef_dll/cpptoc/request_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/scheme_handler_ctocpp.h"
|
||||
#include "libcef_dll/transfer_util.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
@@ -33,7 +32,7 @@ bool CefSchemeHandlerCToCpp::ProcessRequest(CefRefPtr<CefRequest> request,
|
||||
|
||||
transfer_string_contents(mimeTypeRet, mime_type, true);
|
||||
|
||||
return rv;
|
||||
return rv ? true : false;
|
||||
}
|
||||
|
||||
void CefSchemeHandlerCToCpp::Cancel()
|
||||
@@ -50,7 +49,8 @@ bool CefSchemeHandlerCToCpp::ReadResponse(void* data_out, int bytes_to_read,
|
||||
if(CEF_MEMBER_MISSING(struct_, read_response))
|
||||
return false;
|
||||
|
||||
return struct_->read_response(struct_, data_out, bytes_to_read, bytes_read);
|
||||
return struct_->read_response(struct_, data_out, bytes_to_read, bytes_read)
|
||||
? true : false;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
@@ -10,9 +10,8 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/scheme_handler_ctocpp.h"
|
||||
#include "ctocpp/scheme_handler_factory_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/scheme_handler_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/scheme_handler_factory_ctocpp.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
@@ -10,9 +10,8 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/read_handler_cpptoc.h"
|
||||
#include "ctocpp/stream_reader_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/read_handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/stream_reader_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,9 +10,8 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/write_handler_cpptoc.h"
|
||||
#include "ctocpp/stream_writer_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/write_handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/stream_writer_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,9 +10,8 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/v8value_cpptoc.h"
|
||||
#include "ctocpp/v8handler_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/v8value_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/v8handler_ctocpp.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
@@ -48,7 +47,7 @@ bool CefV8HandlerCToCpp::Execute(const std::wstring& name,
|
||||
if(argsStructPtr)
|
||||
delete [] argsStructPtr;
|
||||
|
||||
return rv;
|
||||
return rv ? true : false;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
@@ -10,10 +10,9 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "cpptoc/base_cpptoc.h"
|
||||
#include "cpptoc/v8handler_cpptoc.h"
|
||||
#include "ctocpp/v8value_ctocpp.h"
|
||||
#include "libcef_dll/cpptoc/base_cpptoc.h"
|
||||
#include "libcef_dll/cpptoc/v8handler_cpptoc.h"
|
||||
#include "libcef_dll/ctocpp/v8value_ctocpp.h"
|
||||
|
||||
|
||||
// STATIC METHODS - Body may be edited by hand.
|
||||
@@ -108,7 +107,7 @@ bool CefV8ValueCToCpp::IsUndefined()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_undefined))
|
||||
return false;
|
||||
|
||||
return struct_->is_undefined(struct_);
|
||||
return struct_->is_undefined(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsNull()
|
||||
@@ -116,7 +115,7 @@ bool CefV8ValueCToCpp::IsNull()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_null))
|
||||
return false;
|
||||
|
||||
return struct_->is_null(struct_);
|
||||
return struct_->is_null(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsBool()
|
||||
@@ -124,7 +123,7 @@ bool CefV8ValueCToCpp::IsBool()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_bool))
|
||||
return false;
|
||||
|
||||
return struct_->is_bool(struct_);
|
||||
return struct_->is_bool(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsInt()
|
||||
@@ -132,7 +131,7 @@ bool CefV8ValueCToCpp::IsInt()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_int))
|
||||
return false;
|
||||
|
||||
return struct_->is_int(struct_);
|
||||
return struct_->is_int(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsDouble()
|
||||
@@ -140,7 +139,7 @@ bool CefV8ValueCToCpp::IsDouble()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_double))
|
||||
return false;
|
||||
|
||||
return struct_->is_double(struct_);
|
||||
return struct_->is_double(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsString()
|
||||
@@ -148,7 +147,7 @@ bool CefV8ValueCToCpp::IsString()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_string))
|
||||
return false;
|
||||
|
||||
return struct_->is_string(struct_);
|
||||
return struct_->is_string(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsObject()
|
||||
@@ -156,7 +155,7 @@ bool CefV8ValueCToCpp::IsObject()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_object))
|
||||
return false;
|
||||
|
||||
return struct_->is_object(struct_);
|
||||
return struct_->is_object(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsArray()
|
||||
@@ -164,7 +163,7 @@ bool CefV8ValueCToCpp::IsArray()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_array))
|
||||
return false;
|
||||
|
||||
return struct_->is_array(struct_);
|
||||
return struct_->is_array(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::IsFunction()
|
||||
@@ -172,7 +171,7 @@ bool CefV8ValueCToCpp::IsFunction()
|
||||
if(CEF_MEMBER_MISSING(struct_, is_function))
|
||||
return false;
|
||||
|
||||
return struct_->is_function(struct_);
|
||||
return struct_->is_function(struct_)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::GetBoolValue()
|
||||
@@ -180,7 +179,7 @@ bool CefV8ValueCToCpp::GetBoolValue()
|
||||
if(CEF_MEMBER_MISSING(struct_, get_bool_value))
|
||||
return false;
|
||||
|
||||
return struct_->get_bool_value(struct_);
|
||||
return struct_->get_bool_value(struct_)?true:false;
|
||||
}
|
||||
|
||||
int CefV8ValueCToCpp::GetIntValue()
|
||||
@@ -218,7 +217,7 @@ bool CefV8ValueCToCpp::HasValue(const std::wstring& key)
|
||||
if(CEF_MEMBER_MISSING(struct_, has_value_bykey))
|
||||
return false;
|
||||
|
||||
return struct_->has_value_bykey(struct_, key.c_str());
|
||||
return struct_->has_value_bykey(struct_, key.c_str())?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::HasValue(int index)
|
||||
@@ -226,7 +225,7 @@ bool CefV8ValueCToCpp::HasValue(int index)
|
||||
if(CEF_MEMBER_MISSING(struct_, has_value_byindex))
|
||||
return false;
|
||||
|
||||
return struct_->has_value_byindex(struct_, index);
|
||||
return struct_->has_value_byindex(struct_, index)?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::DeleteValue(const std::wstring& key)
|
||||
@@ -234,7 +233,7 @@ bool CefV8ValueCToCpp::DeleteValue(const std::wstring& key)
|
||||
if(CEF_MEMBER_MISSING(struct_, delete_value_bykey))
|
||||
return false;
|
||||
|
||||
return struct_->delete_value_bykey(struct_, key.c_str());
|
||||
return struct_->delete_value_bykey(struct_, key.c_str())?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::DeleteValue(int index)
|
||||
@@ -242,7 +241,7 @@ bool CefV8ValueCToCpp::DeleteValue(int index)
|
||||
if(CEF_MEMBER_MISSING(struct_, delete_value_byindex))
|
||||
return false;
|
||||
|
||||
return struct_->delete_value_byindex(struct_, index);
|
||||
return struct_->delete_value_byindex(struct_, index)?true:false;
|
||||
}
|
||||
|
||||
CefRefPtr<CefV8Value> CefV8ValueCToCpp::GetValue(const std::wstring& key)
|
||||
@@ -274,7 +273,7 @@ bool CefV8ValueCToCpp::SetValue(const std::wstring& key,
|
||||
return false;
|
||||
|
||||
return struct_->set_value_bykey(struct_, key.c_str(),
|
||||
CefV8ValueCToCpp::Unwrap(value));
|
||||
CefV8ValueCToCpp::Unwrap(value))?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::SetValue(int index, CefRefPtr<CefV8Value> value)
|
||||
@@ -283,7 +282,7 @@ bool CefV8ValueCToCpp::SetValue(int index, CefRefPtr<CefV8Value> value)
|
||||
return false;
|
||||
|
||||
return struct_->set_value_byindex(struct_, index,
|
||||
CefV8ValueCToCpp::Unwrap(value));
|
||||
CefV8ValueCToCpp::Unwrap(value))?true:false;
|
||||
}
|
||||
|
||||
bool CefV8ValueCToCpp::GetKeys(std::vector<std::wstring>& keys)
|
||||
@@ -380,7 +379,7 @@ bool CefV8ValueCToCpp::ExecuteFunction(CefRefPtr<CefV8Value> object,
|
||||
if(argsStructPtr)
|
||||
delete [] argsStructPtr;
|
||||
|
||||
return rv;
|
||||
return rv?true:false;
|
||||
}
|
||||
|
||||
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed wrapper-side only")
|
||||
#else // USING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed wrapper-side only.
|
||||
|
@@ -10,8 +10,7 @@
|
||||
// tools directory for more information.
|
||||
//
|
||||
|
||||
#include "../precompiled_libcef.h"
|
||||
#include "ctocpp/write_handler_ctocpp.h"
|
||||
#include "libcef_dll/ctocpp/write_handler_ctocpp.h"
|
||||
|
||||
|
||||
// VIRTUAL METHODS - Body may be edited by hand.
|
||||
|
@@ -16,9 +16,9 @@
|
||||
#pragma message("Warning: "__FILE__" may be accessed DLL-side only")
|
||||
#else // BUILDING_CEF_SHARED
|
||||
|
||||
#include "cef.h"
|
||||
#include "cef_capi.h"
|
||||
#include "ctocpp.h"
|
||||
#include "include/cef.h"
|
||||
#include "include/cef_capi.h"
|
||||
#include "libcef_dll/ctocpp/ctocpp.h"
|
||||
|
||||
// Wrap a C structure with a C++ class.
|
||||
// This class may be instantiated and accessed DLL-side only.
|
||||
|
Reference in New Issue
Block a user